Move Singleton and related structs to namespace base

extensions/browser/api/test/test_api.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 "extensions/browser/api/test/test_api.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
@@ skipping 93 matching lines @@
   TestConfigState* test_config_state = TestConfigState::GetInstance();
   test_config_state->set_config_state(value);
 }
 
 TestGetConfigFunction::TestConfigState::TestConfigState()
     : config_state_(NULL) {}
 
 // static
 TestGetConfigFunction::TestConfigState*
 TestGetConfigFunction::TestConfigState::GetInstance() {
-  return Singleton<TestConfigState>::get();
+  return base::Singleton<TestConfigState>::get();
 }
 
 TestGetConfigFunction::~TestGetConfigFunction() {}
 
 bool TestGetConfigFunction::RunSafe() {
   TestConfigState* test_config_state = TestConfigState::GetInstance();
 
   if (!test_config_state->config_state()) {
     error_ = kNoTestConfigDataError;
     return false;
   }
 
   SetResult(test_config_state->config_state()->DeepCopy());
   return true;
 }
 
 TestWaitForRoundTripFunction::~TestWaitForRoundTripFunction() {}
 
 bool TestWaitForRoundTripFunction::RunSafe() {
   scoped_ptr<WaitForRoundTrip::Params> params(
       WaitForRoundTrip::Params::Create(*args_));
   SetResult(new base::StringValue(params->message));
   return true;
 }
 
 }  // namespace extensions