Move Singleton and related structs to namespace base

chrome/browser/themes/theme_service_factory.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 "chrome/browser/themes/theme_service_factory.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 21 matching lines @@
   std::string id = GetForProfile(profile)->GetThemeID();
   if (id == ThemeService::kDefaultThemeID)
     return NULL;
 
   return extensions::ExtensionRegistry::Get(
       profile)->enabled_extensions().GetByID(id);
 }
 
 // static
 ThemeServiceFactory* ThemeServiceFactory::GetInstance() {
-  return Singleton<ThemeServiceFactory>::get();
+  return base::Singleton<ThemeServiceFactory>::get();
 }
 
 ThemeServiceFactory::ThemeServiceFactory()
     : BrowserContextKeyedServiceFactory(
           "ThemeService",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
 }
 
 ThemeServiceFactory::~ThemeServiceFactory() {}
@@ skipping 36 matching lines @@
 }
 
 content::BrowserContext* ThemeServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool ThemeServiceFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }