Move Singleton and related structs to namespace base

chrome/browser/favicon/favicon_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/favicon/favicon_service_factory.h"
 
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ skipping 28 matching lines @@
             profile->GetOriginalProfile(), true));
   }
 
   // Profile is OffTheRecord without access.
   NOTREACHED() << "This profile is OffTheRecord";
   return NULL;
 }
 
 // static
 FaviconServiceFactory* FaviconServiceFactory::GetInstance() {
-  return Singleton<FaviconServiceFactory>::get();
+  return base::Singleton<FaviconServiceFactory>::get();
 }
 
 // static
 BrowserContextKeyedServiceFactory::TestingFactoryFunction
 FaviconServiceFactory::GetDefaultFactory() {
   return &BuildFaviconService;
 }
 
 FaviconServiceFactory::FaviconServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "FaviconService",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(HistoryServiceFactory::GetInstance());
 }
 
 FaviconServiceFactory::~FaviconServiceFactory() {
 }
 
 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   return BuildFaviconService(context).release();
 }
 
 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }