Move Singleton and related structs to namespace base

chrome/browser/speech/tts_win.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 <sapi.h>
 
 #include "base/memory/singleton.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 39 matching lines @@
   base::win::ScopedComPtr<ISpVoice> speech_synthesizer_;
 
   // These apply to the current utterance only.
   std::wstring utterance_;
   int utterance_id_;
   int prefix_len_;
   ULONG stream_number_;
   int char_position_;
   bool paused_;
 
-  friend struct DefaultSingletonTraits<TtsPlatformImplWin>;
+  friend struct base::DefaultSingletonTraits<TtsPlatformImplWin>;
 
   DISALLOW_COPY_AND_ASSIGN(TtsPlatformImplWin);
 };
 
 // static
 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
   return TtsPlatformImplWin::GetInstance();
 }
 
 bool TtsPlatformImplWin::Speak(
@@ skipping 170 matching lines @@
         SPFEI(SPEI_SENTENCE_BOUNDARY) |
         SPFEI(SPEI_END_INPUT_STREAM);
     speech_synthesizer_->SetInterest(event_mask, event_mask);
     speech_synthesizer_->SetNotifyCallbackFunction(
         TtsPlatformImplWin::SpeechEventCallback, 0, 0);
   }
 }
 
 // static
 TtsPlatformImplWin* TtsPlatformImplWin::GetInstance() {
-  return Singleton<TtsPlatformImplWin,
-                   LeakySingletonTraits<TtsPlatformImplWin> >::get();
+  return base::Singleton<TtsPlatformImplWin,
+                         base::LeakySingletonTraits<TtsPlatformImplWin>>::get();
 }
 
 // static
 void TtsPlatformImplWin::SpeechEventCallback(
     WPARAM w_param, LPARAM l_param) {
   GetInstance()->OnSpeechEvent();
 }