Move Singleton and related structs to namespace base

chrome/browser/sessions/tab_restore_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/sessions/tab_restore_service_factory.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
@@ skipping 17 matching lines @@
 }
 
 // static
 void TabRestoreServiceFactory::ResetForProfile(Profile* profile) {
   TabRestoreServiceFactory* factory = GetInstance();
   factory->BrowserContextShutdown(profile);
   factory->BrowserContextDestroyed(profile);
 }
 
 TabRestoreServiceFactory* TabRestoreServiceFactory::GetInstance() {
-  return Singleton<TabRestoreServiceFactory>::get();
+  return base::Singleton<TabRestoreServiceFactory>::get();
 }
 
 TabRestoreServiceFactory::TabRestoreServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "TabRestoreService",
         BrowserContextDependencyManager::GetInstance()) {
 }
 
 TabRestoreServiceFactory::~TabRestoreServiceFactory() {
 }
 
 bool TabRestoreServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 KeyedService* TabRestoreServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* browser_context) const {
   Profile* profile = Profile::FromBrowserContext(browser_context);
   scoped_ptr<sessions::TabRestoreServiceClient> client(
       new ChromeTabRestoreServiceClient(profile));
 
 #if defined(OS_ANDROID)
   return new InMemoryTabRestoreService(profile, nullptr);
 #else
   return new PersistentTabRestoreService(profile, client.Pass(), nullptr);
 #endif
 }