Move Singleton and related structs to namespace base

chrome/browser/content_settings/cookie_settings_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/content_settings/cookie_settings_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 10 matching lines @@
 // static
 scoped_refptr<content_settings::CookieSettings>
 CookieSettingsFactory::GetForProfile(Profile* profile) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return static_cast<content_settings::CookieSettings*>(
       GetInstance()->GetServiceForBrowserContext(profile, true).get());
 }
 
 // static
 CookieSettingsFactory* CookieSettingsFactory::GetInstance() {
-  return Singleton<CookieSettingsFactory>::get();
+  return base::Singleton<CookieSettingsFactory>::get();
 }
 
 CookieSettingsFactory::CookieSettingsFactory()
     : RefcountedBrowserContextKeyedServiceFactory(
           "CookieSettings",
           BrowserContextDependencyManager::GetInstance()) {
 }
 
 CookieSettingsFactory::~CookieSettingsFactory() {
 }
@@ skipping 17 matching lines @@
   if (profile->GetPrefs()->GetBoolean(prefs::kBlockThirdPartyCookies)) {
     content::RecordAction(UserMetricsAction("ThirdPartyCookieBlockingEnabled"));
   } else {
     content::RecordAction(
         UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
   }
   return new content_settings::CookieSettings(
       profile->GetHostContentSettingsMap(), profile->GetPrefs(),
       extensions::kExtensionScheme);
 }