Move Singleton and related structs to namespace base

chrome/browser/spellchecker/spellcheck_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/spellchecker/spellcheck_factory.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 20 matching lines @@
   if (!host)
     return NULL;
   content::BrowserContext* context = host->GetBrowserContext();
   if (!context)
     return NULL;
   return GetForContext(context);
 }
 
 // static
 SpellcheckServiceFactory* SpellcheckServiceFactory::GetInstance() {
-  return Singleton<SpellcheckServiceFactory>::get();
+  return base::Singleton<SpellcheckServiceFactory>::get();
 }
 
 SpellcheckServiceFactory::SpellcheckServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "SpellcheckService",
         BrowserContextDependencyManager::GetInstance()) {
   // TODO(erg): Uncomment these as they are initialized.
   // DependsOn(RequestContextFactory::GetInstance());
 }
 
@@ skipping 35 matching lines @@
 }
 
 content::BrowserContext* SpellcheckServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 bool SpellcheckServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }