Move Singleton and related structs to namespace base

content/common/font_cache_dispatcher_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 "content/common/font_cache_dispatcher_win.h"
 
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/strings/string16.h"
 #include "content/common/child_process_messages.h"
 
 namespace content {
 namespace {
 typedef std::vector<base::string16> FontNameVector;
 typedef std::map<FontCacheDispatcher*, FontNameVector> DispatcherToFontNames;
 
 class FontCache {
  public:
-  static FontCache* GetInstance() {
-    return Singleton<FontCache>::get();
-  }
+  static FontCache* GetInstance() { return base::Singleton<FontCache>::get(); }
 
   void PreCacheFont(const LOGFONT& font, FontCacheDispatcher* dispatcher) {
     // TODO(ananta): Remove ScopedTracker below once crbug.com/90127 is fixed.
     tracked_objects::ScopedTracker tracking_profile(
         FROM_HERE_WITH_EXPLICIT_FUNCTION("90127 FontCache::PreCacheFont"));
 
     base::AutoLock lock(mutex_);
 
     // Fetch the font into memory.
     // No matter the font is cached or not, we load it to avoid GDI swapping out
@@ skipping 81 matching lines @@
       if (dc_) {
         ReleaseDC(NULL, dc_);
       }
     }
 
     HFONT font_;
     HGDIOBJ old_font_;
     HDC dc_;
     int ref_count_;
   };
-  friend struct DefaultSingletonTraits<FontCache>;
+  friend struct base::DefaultSingletonTraits<FontCache>;
 
   FontCache() {
   }
 
   std::map<base::string16, CacheElement> cache_;
   DispatcherToFontNames dispatcher_font_map_;
   base::Lock mutex_;
 
   DISALLOW_COPY_AND_ASSIGN(FontCache);
 };
@@ skipping 51 matching lines @@
   FontCache::GetInstance()->PreCacheFont(font, this);
 }
 
 void FontCacheDispatcher::OnReleaseCachedFonts() {
   // Release cached fonts that requested from a pid by decrementing the ref
   // count.  When ref count is zero, the handles are released.
   FontCache::GetInstance()->ReleaseCachedFonts(this);
 }
 
 }  // namespace content