Move Singleton and related structs to namespace base

base/test/test_support_android.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 <stdarg.h>
 #include <string.h>
 
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 21 matching lines @@
   bool should_quit;
 };
 
 RunState* g_state = NULL;
 
 // A singleton WaitableEvent wrapper so we avoid a busy loop in
 // MessagePumpForUIStub. Other platforms use the native event loop which blocks
 // when there are no pending messages.
 class Waitable {
  public:
-   static Waitable* GetInstance() {
-     return Singleton<Waitable>::get();
-   }
+  static Waitable* GetInstance() { return base::Singleton<Waitable>::get(); }
 
    // Signals that there are more work to do.
    void Signal() {
      waitable_event_.Signal();
    }
 
    // Blocks until more work is scheduled.
    void Block() {
      waitable_event_.Wait();
    }
 
    void Quit() {
      g_state->should_quit = true;
      Signal();
    }
 
  private:
-  friend struct DefaultSingletonTraits<Waitable>;
+  friend struct base::DefaultSingletonTraits<Waitable>;
 
   Waitable()
       : waitable_event_(false, false) {
   }
 
   base::WaitableEvent waitable_event_;
 
   DISALLOW_COPY_AND_ASSIGN(Waitable);
 };
 
@@ skipping 102 matching lines @@
   if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
     LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
 }
 
 void InitAndroidTest() {
   InitAndroidTestLogging();
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
 }  // namespace base