Move Singleton and related structs to namespace base

chrome/browser/geolocation/geolocation_permission_context_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/geolocation/geolocation_permission_context_factory.h"
 
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #if defined(OS_ANDROID)
 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
 #else
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #endif
 
 
 // static
 GeolocationPermissionContext*
 GeolocationPermissionContextFactory::GetForProfile(Profile* profile) {
   return static_cast<GeolocationPermissionContext*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
 GeolocationPermissionContextFactory*
 GeolocationPermissionContextFactory::GetInstance() {
-  return Singleton<GeolocationPermissionContextFactory>::get();
+  return base::Singleton<GeolocationPermissionContextFactory>::get();
 }
 
 #if !defined(OS_ANDROID)
 GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
     : BrowserContextKeyedServiceFactory(
           "GeolocationPermissionContext",
           BrowserContextDependencyManager::GetInstance()) {
 }
 #else
 GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
@@ skipping 23 matching lines @@
 #if defined(OS_ANDROID)
   registry->RegisterBooleanPref(prefs::kGeolocationEnabled, true);
 #endif
 }
 
 content::BrowserContext*
 GeolocationPermissionContextFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }