diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/crypto/cssm_init.cc | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/crypto/cssm_init.cc')
| -rw-r--r-- | chromium/crypto/cssm_init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/crypto/cssm_init.cc b/chromium/crypto/cssm_init.cc index 208309c351e..495e71b68ab 100644 --- a/chromium/crypto/cssm_init.cc +++ b/chromium/crypto/cssm_init.cc @@ -39,8 +39,8 @@ void* CSSMCalloc(uint32 num, CSSM_SIZE size, void* alloc_ref) { class CSSMInitSingleton { public: static CSSMInitSingleton* GetInstance() { - return Singleton<CSSMInitSingleton, - LeakySingletonTraits<CSSMInitSingleton> >::get(); + return base::Singleton<CSSMInitSingleton, base::LeakySingletonTraits< + CSSMInitSingleton>>::get(); } CSSM_CSP_HANDLE csp_handle() const { return csp_handle_; } @@ -150,7 +150,7 @@ class CSSMInitSingleton { CSSM_CL_HANDLE cl_handle_; CSSM_TP_HANDLE tp_handle_; - friend struct DefaultSingletonTraits<CSSMInitSingleton>; + friend struct base::DefaultSingletonTraits<CSSMInitSingleton>; }; } // namespace |