Move Singleton and related structs to namespace base

ui/gfx/sys_color_change_listener.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/sys_color_change_listener.h"
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 38 matching lines @@
 namespace gfx {
 
 class SysColorChangeObserver {
  public:
   static SysColorChangeObserver* GetInstance();
 
   void AddListener(SysColorChangeListener* listener);
   void RemoveListener(SysColorChangeListener* listener);
 
  private:
-  friend struct DefaultSingletonTraits<SysColorChangeObserver>;
+  friend struct base::DefaultSingletonTraits<SysColorChangeObserver>;
 
   SysColorChangeObserver();
   virtual ~SysColorChangeObserver();
 
   void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
 
   base::ObserverList<SysColorChangeListener> listeners_;
   scoped_ptr<gfx::SingletonHwndObserver> singleton_hwnd_observer_;
 };
 
 // static
 SysColorChangeObserver* SysColorChangeObserver::GetInstance() {
-  return Singleton<SysColorChangeObserver>::get();
+  return base::Singleton<SysColorChangeObserver>::get();
 }
 
 SysColorChangeObserver::SysColorChangeObserver()
     : singleton_hwnd_observer_(new SingletonHwndObserver(
           base::Bind(&SysColorChangeObserver::OnWndProc,
                      base::Unretained(this)))) {}
 
 SysColorChangeObserver::~SysColorChangeObserver() {}
 
 void SysColorChangeObserver::AddListener(SysColorChangeListener* listener) {
@@ skipping 19 matching lines @@
     SysColorChangeListener* listener)
     : listener_(listener) {
   SysColorChangeObserver::GetInstance()->AddListener(listener_);
 }
 
 ScopedSysColorChangeListener::~ScopedSysColorChangeListener() {
   SysColorChangeObserver::GetInstance()->RemoveListener(listener_);
 }
 
 }  // namespace gfx