Move Singleton and related structs to namespace base

content/renderer/render_widget.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 "content/renderer/render_widget.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 103 matching lines @@
 using blink::WebVector;
 using blink::WebWidget;
 
 namespace {
 
 typedef std::map<std::string, ui::TextInputMode> TextInputModeMap;
 
 class TextInputModeMapSingleton {
  public:
   static TextInputModeMapSingleton* GetInstance() {
-    return Singleton<TextInputModeMapSingleton>::get();
+    return base::Singleton<TextInputModeMapSingleton>::get();
   }
   TextInputModeMapSingleton() {
     map_["verbatim"] = ui::TEXT_INPUT_MODE_VERBATIM;
     map_["latin"] = ui::TEXT_INPUT_MODE_LATIN;
     map_["latin-name"] = ui::TEXT_INPUT_MODE_LATIN_NAME;
     map_["latin-prose"] = ui::TEXT_INPUT_MODE_LATIN_PROSE;
     map_["full-width-latin"] = ui::TEXT_INPUT_MODE_FULL_WIDTH_LATIN;
     map_["kana"] = ui::TEXT_INPUT_MODE_KANA;
     map_["katakana"] = ui::TEXT_INPUT_MODE_KATAKANA;
     map_["numeric"] = ui::TEXT_INPUT_MODE_NUMERIC;
     map_["tel"] = ui::TEXT_INPUT_MODE_TEL;
     map_["email"] = ui::TEXT_INPUT_MODE_EMAIL;
     map_["url"] = ui::TEXT_INPUT_MODE_URL;
   }
   const TextInputModeMap& map() const { return map_; }
  private:
   TextInputModeMap map_;
 
-  friend struct DefaultSingletonTraits<TextInputModeMapSingleton>;
+  friend struct base::DefaultSingletonTraits<TextInputModeMapSingleton>;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputModeMapSingleton);
 };
 
 ui::TextInputMode ConvertInputMode(const blink::WebString& input_mode) {
   static TextInputModeMapSingleton* singleton =
       TextInputModeMapSingleton::GetInstance();
   TextInputModeMap::const_iterator it =
       singleton->map().find(input_mode.utf8());
   if (it == singleton->map().end())
@@ skipping 2276 matching lines @@
 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.AddObserver(frame);
 }
 
 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) {
   video_hole_frames_.RemoveObserver(frame);
 }
 #endif  // defined(VIDEO_HOLE)
 
 }  // namespace content