Move Singleton and related structs to namespace base

ui/gfx/font_render_params_win.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/win/registry.h"
@@ skipping 29 matching lines @@
   }
 
   // No explicit ClearType settings, default to RGB.
   return FontRenderParams::SUBPIXEL_RENDERING_RGB;
 }
 
 // Caches font render params and updates them on system notifications.
 class CachedFontRenderParams {
  public:
   static CachedFontRenderParams* GetInstance() {
-    return Singleton<CachedFontRenderParams>::get();
+    return base::Singleton<CachedFontRenderParams>::get();
   }
 
   const FontRenderParams& GetParams() {
     if (params_)
       return *params_;
 
     params_.reset(new FontRenderParams());
     params_->antialiasing = false;
     params_->subpixel_positioning = false;
     params_->autohinter = false;
@@ skipping 13 matching lines @@
         params_->subpixel_rendering = GetSubpixelRenderingGeometry();
       }
     }
     singleton_hwnd_observer_.reset(new SingletonHwndObserver(
         base::Bind(&CachedFontRenderParams::OnWndProc,
                    base::Unretained(this))));
     return *params_;
   }
 
  private:
-  friend struct DefaultSingletonTraits<CachedFontRenderParams>;
+  friend struct base::DefaultSingletonTraits<CachedFontRenderParams>;
 
   CachedFontRenderParams() {}
   ~CachedFontRenderParams() {}
 
   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
     if (message == WM_SETTINGCHANGE) {
       params_.reset();
       singleton_hwnd_observer_.reset(nullptr);
     }
   }
 
   scoped_ptr<FontRenderParams> params_;
   scoped_ptr<SingletonHwndObserver> singleton_hwnd_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams);
 };
 
 }  // namespace
 
 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
                                      std::string* family_out) {
   if (family_out)
     NOTIMPLEMENTED();
   // Customized font rendering settings are not supported, only defaults.
   return CachedFontRenderParams::GetInstance()->GetParams();
 }
 
 }  // namespace gfx