Move Singleton and related structs to namespace base

ios/public/test/test_keyed_service_provider.cc

 // Copyright 2015 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 "ios/public/test/test_keyed_service_provider.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
 #include "components/sync_driver/fake_sync_service.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/public/test/fake_sync_service_factory.h"
 
 namespace ios {
 namespace {
 
 class MissingServiceKeyedServiceFactory
     : public BrowserStateKeyedServiceFactory {
  public:
   static MissingServiceKeyedServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<MissingServiceKeyedServiceFactory>;
+  friend struct base::DefaultSingletonTraits<MissingServiceKeyedServiceFactory>;
 
   MissingServiceKeyedServiceFactory();
   ~MissingServiceKeyedServiceFactory() override;
 
   // BrowserStateKeyedServiceFactory implementation.
   scoped_ptr<KeyedService> BuildServiceInstanceFor(
       web::BrowserState* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(MissingServiceKeyedServiceFactory);
 };
 
 // static
 MissingServiceKeyedServiceFactory*
 MissingServiceKeyedServiceFactory::GetInstance() {
-  return Singleton<MissingServiceKeyedServiceFactory>::get();
+  return base::Singleton<MissingServiceKeyedServiceFactory>::get();
 }
 
 MissingServiceKeyedServiceFactory::MissingServiceKeyedServiceFactory()
     : BrowserStateKeyedServiceFactory(
           "MissingService",
           BrowserStateDependencyManager::GetInstance()) {
 }
 
 MissingServiceKeyedServiceFactory::~MissingServiceKeyedServiceFactory() {
 }
@@ skipping 39 matching lines @@
   return MissingServiceKeyedServiceFactory::GetInstance();
 }
 
 invalidation::ProfileInvalidationProvider*
 TestKeyedServiceProvider::GetProfileInvalidationProviderForBrowserState(
     ios::ChromeBrowserState* browser_state) {
   return nullptr;
 }
 
 }  // namespace ios