Move Singleton and related structs to namespace base

chrome/browser/history/history_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/history/history_service_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 37 matching lines @@
 
 // static
 history::HistoryService* HistoryServiceFactory::GetForProfileWithoutCreating(
     Profile* profile) {
   return static_cast<history::HistoryService*>(
       GetInstance()->GetServiceForBrowserContext(profile, false));
 }
 
 // static
 HistoryServiceFactory* HistoryServiceFactory::GetInstance() {
-  return Singleton<HistoryServiceFactory>::get();
+  return base::Singleton<HistoryServiceFactory>::get();
 }
 
 // static
 void HistoryServiceFactory::ShutdownForProfile(Profile* profile) {
   HistoryServiceFactory* factory = GetInstance();
   factory->BrowserContextDestroyed(profile);
 }
 
 HistoryServiceFactory::HistoryServiceFactory()
     : BrowserContextKeyedServiceFactory(
@@ skipping 22 matching lines @@
 }
 
 content::BrowserContext* HistoryServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool HistoryServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }