Move Singleton and related structs to namespace base

ui/views/test/event_generator_delegate_mac.mm

 // Copyright 2014 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/memory/singleton.h"
 #include "ui/events/event_processor.h"
@@ skipping 206 matching lines @@
 // Implementation of ui::test::EventGeneratorDelegate for Mac. Everything
 // defined inline is just a stub. Interesting overrides are defined below the
 // class.
 class EventGeneratorDelegateMac : public ui::EventTarget,
                                   public ui::EventSource,
                                   public ui::EventProcessor,
                                   public ui::EventTargeter,
                                   public ui::test::EventGeneratorDelegate {
  public:
   static EventGeneratorDelegateMac* GetInstance() {
-    return Singleton<EventGeneratorDelegateMac>::get();
+    return base::Singleton<EventGeneratorDelegateMac>::get();
   }
 
   IMP CurrentEventMethod() {
     return swizzle_current_event_->GetOriginalImplementation();
   }
 
   NSWindow* window() { return window_.get(); }
   ui::test::EventGenerator* owner() { return owner_; }
 
   // Overridden from ui::EventTarget:
@@ skipping 40 matching lines @@
   gfx::Point CenterOfWindow(gfx::NativeWindow window) const override;
 
   void ConvertPointFromTarget(const ui::EventTarget* target,
                               gfx::Point* point) const override {}
   void ConvertPointToTarget(const ui::EventTarget* target,
                             gfx::Point* point) const override {}
   void ConvertPointFromHost(const ui::EventTarget* hosted_target,
                             gfx::Point* point) const override {}
 
  private:
-  friend struct DefaultSingletonTraits<EventGeneratorDelegateMac>;
+  friend struct base::DefaultSingletonTraits<EventGeneratorDelegateMac>;
 
   EventGeneratorDelegateMac();
   ~EventGeneratorDelegateMac() override;
 
   ui::test::EventGenerator* owner_;
   base::scoped_nsobject<NSWindow> window_;
   scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_pressed_;
   scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_location_;
   scoped_ptr<base::mac::ScopedObjCClassSwizzler> swizzle_current_event_;
   base::scoped_nsobject<NSMenu> fake_menu_;
@@ skipping 174 matching lines @@
 - (NSEvent*)currentEvent {
   if (g_current_event)
     return g_current_event;
 
   // Find the original implementation and invoke it.
   IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
   return original(self, _cmd);
 }
 
 @end