| Index: chrome/browser/speech/tts_linux.cc
|
| diff --git a/chrome/browser/speech/tts_linux.cc b/chrome/browser/speech/tts_linux.cc
|
| index 05360b1868aa05a8b6df55abf60a3eea31d80321..ba15516ce03688052dd06e583bb99a34f5390b86 100644
|
| --- a/chrome/browser/speech/tts_linux.cc
|
| +++ b/chrome/browser/speech/tts_linux.cc
|
| @@ -83,7 +83,7 @@ class TtsPlatformImplLinux : public TtsPlatformImpl {
|
| // uniquely identify a voice across all available modules.
|
| scoped_ptr<std::map<std::string, SPDChromeVoice> > all_native_voices_;
|
|
|
| - friend struct DefaultSingletonTraits<TtsPlatformImplLinux>;
|
| + friend struct base::DefaultSingletonTraits<TtsPlatformImplLinux>;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplLinux);
|
| };
|
| @@ -346,8 +346,9 @@ void TtsPlatformImplLinux::IndexMarkCallback(size_t msg_id,
|
|
|
| // static
|
| TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() {
|
| - return Singleton<TtsPlatformImplLinux,
|
| - LeakySingletonTraits<TtsPlatformImplLinux> >::get();
|
| + return base::Singleton<
|
| + TtsPlatformImplLinux,
|
| + base::LeakySingletonTraits<TtsPlatformImplLinux>>::get();
|
| }
|
|
|
| // static
|
|
|