| Index: chrome/browser/geolocation/geolocation_permission_context_factory.cc
|
| diff --git a/chrome/browser/geolocation/geolocation_permission_context_factory.cc b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
|
| index 2fff431a3232460df742062674d43760d19164cb..27742b6b43d6ad76ccbc9c720c144d86cb76937a 100644
|
| --- a/chrome/browser/geolocation/geolocation_permission_context_factory.cc
|
| +++ b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
|
| @@ -31,13 +31,13 @@ GeolocationPermissionContextFactory::GetInstance() {
|
|
|
| #if !defined(OS_ANDROID)
|
| GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
|
| - : BrowserContextKeyedServiceFactory(
|
| + : PermissionContextFactoryBase(
|
| "GeolocationPermissionContext",
|
| BrowserContextDependencyManager::GetInstance()) {
|
| }
|
| #else
|
| GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
|
| - : BrowserContextKeyedServiceFactory(
|
| + : PermissionContextFactoryBase(
|
| "GeolocationPermissionContextAndroid",
|
| BrowserContextDependencyManager::GetInstance()) {
|
| }
|
| @@ -64,9 +64,3 @@ void GeolocationPermissionContextFactory::RegisterProfilePrefs(
|
| registry->RegisterBooleanPref(prefs::kGeolocationEnabled, true);
|
| #endif
|
| }
|
| -
|
| -content::BrowserContext*
|
| -GeolocationPermissionContextFactory::GetBrowserContextToUse(
|
| - content::BrowserContext* context) const {
|
| - return chrome::GetBrowserContextOwnInstanceInIncognito(context);
|
| -}
|
|
|