Move Singleton and related structs to namespace base

chrome/browser/invalidation/profile_invalidation_provider_factory.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 "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/invalidation/ticl_profile_settings_provider.h"
@@ skipping 50 matching lines @@
     return NULL;
   }
 #endif
   return static_cast<ProfileInvalidationProvider*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 ProfileInvalidationProviderFactory*
 ProfileInvalidationProviderFactory::GetInstance() {
-  return Singleton<ProfileInvalidationProviderFactory>::get();
+  return base::Singleton<ProfileInvalidationProviderFactory>::get();
 }
 
 ProfileInvalidationProviderFactory::ProfileInvalidationProviderFactory()
     : BrowserContextKeyedServiceFactory(
         "InvalidationService",
         BrowserContextDependencyManager::GetInstance()),
       testing_factory_(NULL) {
 #if !defined(OS_ANDROID)
   DependsOn(SigninManagerFactory::GetInstance());
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
@@ skipping 57 matching lines @@
 
 void ProfileInvalidationProviderFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kInvalidationServiceUseGCMChannel,
       true);  // if no value in prefs, use GCM channel.
   InvalidatorStorage::RegisterProfilePrefs(registry);
 }
 
 }  // namespace invalidation