Move Singleton and related structs to namespace base

ui/gfx/font_fallback_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 "ui/gfx/font_fallback_win.h"
 
 #include <usp10.h>
 
 #include <map>
 
@@ skipping 95 matching lines @@
 // system fonts and their font link chains.
 class CachedFontLinkSettings {
  public:
   static CachedFontLinkSettings* GetInstance();
 
   // Returns the linked fonts list correspond to |font|. Returned value will
   // never be null.
   const std::vector<Font>* GetLinkedFonts(const Font& font);
 
  private:
-  friend struct DefaultSingletonTraits<CachedFontLinkSettings>;
+  friend struct base::DefaultSingletonTraits<CachedFontLinkSettings>;
 
   CachedFontLinkSettings();
   virtual ~CachedFontLinkSettings();
 
   // Map of system fonts, from file names to font families.
   std::map<std::string, std::string> cached_system_fonts_;
 
   // Map from font names to vectors of linked fonts.
   std::map<std::string, std::vector<Font> > cached_linked_fonts_;
 
   DISALLOW_COPY_AND_ASSIGN(CachedFontLinkSettings);
 };
 
 // static
 CachedFontLinkSettings* CachedFontLinkSettings::GetInstance() {
-  return Singleton<CachedFontLinkSettings,
-                   LeakySingletonTraits<CachedFontLinkSettings> >::get();
+  return base::Singleton<
+      CachedFontLinkSettings,
+      base::LeakySingletonTraits<CachedFontLinkSettings>>::get();
 }
 
 const std::vector<Font>* CachedFontLinkSettings::GetLinkedFonts(
     const Font& font) {
   const std::string& font_name = font.GetFontName();
   std::map<std::string, std::vector<Font> >::const_iterator it =
       cached_linked_fonts_.find(font_name);
   if (it != cached_linked_fonts_.end())
     return &it->second;
 
@@ skipping 178 matching lines @@
                      font.GetFontSize());
       found_fallback = true;
     }
   }
   DeleteEnhMetaFile(meta_file);
 
   return found_fallback;
 }
 
 }  // namespace gfx