Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 650 matching lines @@
     ExtensionService* extension_service = GetExtensionService();
     if (extension_service)
       host_content_settings_map_->RegisterExtensionService(extension_service);
 #endif
   }
   return host_content_settings_map_.get();
 }
 
 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*
     TestingProfile::GetSpeechRecognitionPreferences() {
 #if defined(ENABLE_INPUT_SPEECH)
   return ChromeSpeechRecognitionPreferences::GetForProfile(this);
 #else
   return NULL;
 #endif
 }
@@ skipping 113 matching lines @@
 
 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
   DCHECK(!build_called_);
   build_called_ = true;
   return scoped_ptr<TestingProfile>(new TestingProfile(
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass()));
 }