Move Singleton and related structs to namespace base

chrome/browser/speech/tts_linux.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <math.h>
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
@@ skipping 65 matching lines @@
   SPDConnection* conn_;
 
   // These apply to the current utterance only.
   std::string utterance_;
   int utterance_id_;
 
   // Map a string composed of a voicename and module to the voicename. Used to
   // 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);
 };
 
 // static
 SPDNotificationType TtsPlatformImplLinux::current_notification_ =
     SPD_EVENT_END;
 
 TtsPlatformImplLinux::TtsPlatformImplLinux()
     : utterance_id_(0) {
@@ skipping 242 matching lines @@
     current_notification_ = state;
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TtsPlatformImplLinux::OnSpeechEvent,
         base::Unretained(TtsPlatformImplLinux::GetInstance()),
         state));
   }
 }
 
 // static
 TtsPlatformImplLinux* TtsPlatformImplLinux::GetInstance() {
-  return Singleton<TtsPlatformImplLinux,
-                   LeakySingletonTraits<TtsPlatformImplLinux> >::get();
+  return base::Singleton<
+      TtsPlatformImplLinux,
+      base::LeakySingletonTraits<TtsPlatformImplLinux>>::get();
 }
 
 // static
 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
   return TtsPlatformImplLinux::GetInstance();
 }