Move Singleton and related structs to namespace base

chrome/browser/speech/tts_controller_impl.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_SPEECH_TTS_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_SPEECH_TTS_CONTROLLER_IMPL_H_
 
 #include <queue>
 #include <set>
 #include <string>
@@ skipping 57 matching lines @@
   void FinishCurrentUtterance();
 
   // Start speaking the next utterance in the queue.
   void SpeakNextUtterance();
 
   // Given an utterance and a vector of voices, return the
   // index of the voice that best matches the utterance.
   int GetMatchingVoice(const Utterance* utterance,
                        std::vector<VoiceData>& voices);
 
-  friend struct DefaultSingletonTraits<TtsControllerImpl>;
+  friend struct base::DefaultSingletonTraits<TtsControllerImpl>;
 
   // The current utterance being spoken.
   Utterance* current_utterance_;
 
   // Whether the queue is paused or not.
   bool paused_;
 
   // A queue of utterances to speak after the current one finishes.
   std::queue<Utterance*> utterance_queue_;
 
   // A set of delegates that want to be notified when the voices change.
   std::set<VoicesChangedDelegate*> voices_changed_delegates_;
 
   // A pointer to the platform implementation of text-to-speech, for
   // dependency injection.
   TtsPlatformImpl* platform_impl_;
 
   // The delegate that processes TTS requests with user-installed extensions.
   TtsEngineDelegate* tts_engine_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TtsControllerImpl);
 };
 
 #endif  // CHROME_BROWSER_SPEECH_TTS_CONTROLLER_IMPL_H_