Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 1d2a6f66eb25edc23717a97717f0028336d96de8..77dee9ec93bec2662a386a986150958c20da53fc 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -668,11 +668,7 @@ HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {
 
 content::GeolocationPermissionContext*
 TestingProfile::GetGeolocationPermissionContext() {
-  if (!geolocation_permission_context_.get()) {
-    geolocation_permission_context_ =
-        ChromeGeolocationPermissionContextFactory::Create(this);
-  }
-  return geolocation_permission_context_.get();
+  return ChromeGeolocationPermissionContextFactory::GetForProfile(this);

[rpetterson, 2012/12/18 21:22:17]

Normally GetForProfile will return NULL by default in a TestingProfile. It
doesn't look like you want this to be the case, so you should override
ServiceHasOwnInstanceInIncognito in the factory.

[John Knottenbelt, 2012/12/19 16:01:09]

I am not sure about the relationship between the TestingProfile and Incognito.
It seems that a TestingProfile can be made to be incognito through the
set_incognito API. And it seems that ProfileKeyedBaseFactory::GetProfileToUse is
the place where this information takes effect. 

The way we have it right now, we want the GeolocationPermissionContext to be
shared between regular and off the record profiles, so intuitively I would have
thought that I need to implement ServiceRedirectedInIncognito, rather than
ServiceHasOwnInstanceInIncognito?

On 2012/12/18 21:22:17, rpetterson wrote:

[rpetterson, 2012/12/19 22:22:44]

Apologies -- I was confusing TestingProfile and Incognito in my comment.
Although it did raise a good point about incognito. If you want the Incognito
profile to refer to the same GeolocationPermissionContext as the original
profile, then yes, you'll need to override ServiceRedirectedInIncognito to
return true.

 }
 
 content::SpeechRecognitionPreferences*