Move Singleton and related structs to namespace base

ui/base/win/hwnd_subclass.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/base/win/hwnd_subclass.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 37 matching lines @@
 
 }  // namespace
 
 namespace ui {
 
 // Singleton factory that creates and manages the lifetime of all
 // ui::HWNDSubclass objects.
 class HWNDSubclass::HWNDSubclassFactory {
  public:
   static HWNDSubclassFactory* GetInstance() {
-    return Singleton<HWNDSubclassFactory,
-        LeakySingletonTraits<HWNDSubclassFactory> >::get();
+    return base::Singleton<
+        HWNDSubclassFactory,
+        base::LeakySingletonTraits<HWNDSubclassFactory>>::get();
   }
 
   // Returns a non-null HWNDSubclass corresponding to the HWND |target|. Creates
   // one if none exists. Retains ownership of the returned pointer.
   HWNDSubclass* GetHwndSubclassForTarget(HWND target) {
     DCHECK(target);
     HWNDSubclass* subclass = reinterpret_cast<HWNDSubclass*>(
         ui::ViewProp::GetValue(target, kHWNDSubclassKey));
     if (!subclass) {
       subclass = new ui::HWNDSubclass(target);
       hwnd_subclasses_.push_back(subclass);
     }
     return subclass;
   }
 
   const ScopedVector<HWNDSubclass>& hwnd_subclasses() {
     return hwnd_subclasses_;
   }
 
  private:
-  friend struct DefaultSingletonTraits<HWNDSubclassFactory>;
+  friend struct base::DefaultSingletonTraits<HWNDSubclassFactory>;
 
   HWNDSubclassFactory() {}
 
   ScopedVector<HWNDSubclass> hwnd_subclasses_;
 
   DISALLOW_COPY_AND_ASSIGN(HWNDSubclassFactory);
 };
 
 // static
 void HWNDSubclass::AddFilterToTarget(HWND target, HWNDMessageFilter* filter) {
@@ skipping 70 matching lines @@
   // In most cases, |original_wnd_proc_| will take care of calling
   // DefWindowProc.
   return CallWindowProc(original_wnd_proc_, hwnd, message, w_param, l_param);
 }
 
 HWNDMessageFilter::~HWNDMessageFilter() {
   HWNDSubclass::RemoveFilterFromAllTargets(this);
 }
 
 }  // namespace ui