Move Singleton and related structs to namespace base

ui/base/x/x11_util.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.
 
 // This file defines utility functions for X11 (Linux only). This code has been
 // ported from XCB since we can't use XCB on Ubuntu while its 32-bit support
 // remains woefully incomplete.
 
 #include "ui/base/x/x11_util.h"
 
@@ skipping 193 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(XCursorCache);
 };
 
 XCursorCache* cursor_cache = NULL;
 
 // A process wide singleton cache for custom X cursors.
 class XCustomCursorCache {
  public:
   static XCustomCursorCache* GetInstance() {
-    return Singleton<XCustomCursorCache>::get();
+    return base::Singleton<XCustomCursorCache>::get();
   }
 
   ::Cursor InstallCustomCursor(XcursorImage* image) {
     XCustomCursor* custom_cursor = new XCustomCursor(image);
     ::Cursor xcursor = custom_cursor->cursor();
     cache_[xcursor] = custom_cursor;
     return xcursor;
   }
 
   void Ref(::Cursor cursor) {
     cache_[cursor]->Ref();
   }
 
   void Unref(::Cursor cursor) {
     if (cache_[cursor]->Unref())
       cache_.erase(cursor);
   }
 
   void Clear() {
     cache_.clear();
   }
 
   const XcursorImage* GetXcursorImage(::Cursor cursor) const {
     return cache_.find(cursor)->second->image();
   }
 
  private:
-  friend struct DefaultSingletonTraits<XCustomCursorCache>;
+  friend struct base::DefaultSingletonTraits<XCustomCursorCache>;
 
   class XCustomCursor {
    public:
     // This takes ownership of the image.
     XCustomCursor(XcursorImage* image)
         : image_(image),
           ref_(1) {
       cursor_ = XcursorImageLoadCursor(gfx::GetXDisplay(), image);
     }
 
@@ skipping 1154 matching lines @@
       << "request_code " << static_cast<int>(error_event.request_code) << ", "
       << "minor_code " << static_cast<int>(error_event.minor_code)
       << " (" << request_str << ")";
 }
 
 // ----------------------------------------------------------------------------
 // End of x11_util_internal.h
 
 
 }  // namespace ui