Move Singleton and related structs to namespace base

chrome/browser/invalidation/profile_invalidation_provider_factory.h

 // 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.
 
 #ifndef CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
 #define CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ skipping 31 matching lines @@
 
   static ProfileInvalidationProviderFactory* GetInstance();
 
   // Switches service creation to go through |testing_factory| for all browser
   // contexts.
   void RegisterTestingFactory(TestingFactoryFunction testing_factory);
 
  private:
   friend class ProfileInvalidationProviderFactoryTestBase;
   friend class policy::AffiliatedInvalidationServiceProviderImplTest;
-  friend struct DefaultSingletonTraits<ProfileInvalidationProviderFactory>;
+  friend struct base::DefaultSingletonTraits<
+      ProfileInvalidationProviderFactory>;
 
   ProfileInvalidationProviderFactory();
   ~ProfileInvalidationProviderFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
   void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) override;
 
   TestingFactoryFunction testing_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileInvalidationProviderFactory);
 };
 
 }  // namespace invalidation
 
 #endif  // CHROME_BROWSER_INVALIDATION_PROFILE_INVALIDATION_PROVIDER_FACTORY_H_