Move Singleton and related structs to namespace base

chrome/browser/speech/tts_chromeos.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 "chrome/browser/speech/tts_platform.h"
 
 // Chrome OS doesn't have native TTS, instead it includes a built-in
 // component extension that provides speech synthesis. This class includes
 // an implementation of LoadBuiltInTtsExtension and dummy implementations of
 // everything else.
@@ skipping 30 matching lines @@
 
   void GetVoices(std::vector<VoiceData>* out_voices) override {}
 
   // Get the single instance of this class.
   static TtsPlatformImplChromeOs* GetInstance();
 
  private:
   TtsPlatformImplChromeOs() {}
   ~TtsPlatformImplChromeOs() override {}
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplChromeOs>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplChromeOs>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplChromeOs);
 };
 
 // static
 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
   return TtsPlatformImplChromeOs::GetInstance();
 }
 
 // static
 TtsPlatformImplChromeOs*
 TtsPlatformImplChromeOs::GetInstance() {
-  return Singleton<TtsPlatformImplChromeOs>::get();
+  return base::Singleton<TtsPlatformImplChromeOs>::get();
 }