Move Singleton and related structs to namespace base

ui/aura/test/event_generator_delegate_aura.cc

 // 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.
 
 #include "ui/aura/test/event_generator_delegate_aura.h"
 
 #include "base/memory/singleton.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 
 namespace aura {
 namespace test {
 namespace {
 
 class DefaultEventGeneratorDelegate : public EventGeneratorDelegateAura {
  public:
   static DefaultEventGeneratorDelegate* GetInstance() {
-    return Singleton<DefaultEventGeneratorDelegate>::get();
+    return base::Singleton<DefaultEventGeneratorDelegate>::get();
   }
 
   // EventGeneratorDelegate:
   void SetContext(ui::test::EventGenerator* owner,
                   gfx::NativeWindow root_window,
                   gfx::NativeWindow window) override {
     root_window_ = root_window;
   }
 
   // EventGeneratorDelegateAura:
   WindowTreeHost* GetHostAt(const gfx::Point& point) const override {
     return root_window_->GetHost();
   }
 
   client::ScreenPositionClient* GetScreenPositionClient(
       const aura::Window* window) const override {
     return NULL;
   }
 
  private:
-  friend struct DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
+  friend struct base::DefaultSingletonTraits<DefaultEventGeneratorDelegate>;
 
   DefaultEventGeneratorDelegate() : root_window_(NULL) {
     DCHECK(!ui::test::EventGenerator::default_delegate);
     ui::test::EventGenerator::default_delegate = this;
   }
 
   ~DefaultEventGeneratorDelegate() override {
     DCHECK_EQ(this, ui::test::EventGenerator::default_delegate);
     ui::test::EventGenerator::default_delegate = NULL;
   }
@@ skipping 70 matching lines @@
 
 void EventGeneratorDelegateAura::ConvertPointFromHost(
     const ui::EventTarget* hosted_target,
     gfx::Point* point) const {
   const Window* window = WindowFromTarget(hosted_target);
   window->GetHost()->ConvertPointFromHost(point);
 }
 
 }  // namespace test
 }  // namespace aura