Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 838 matching lines @@
 }
 
 HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
   if (!host_content_settings_map_.get()) {
     host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
   }
   return host_content_settings_map_.get();
 }
 
 content::GeolocationPermissionContext*
     ProfileImpl::GetGeolocationPermissionContext() {

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

Do you have any plans to eventually remove this function as well? (usually done
in a separate CL if there are a lot of instances in the codebase)

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

Not sure yet. One problem is that RenderProcessHostImpl::CreateMessageFilters in
the content/ layer refers to BrowserContext::GetGeolocationPermissionContext, to
get the ChromeGeolocationPermissionContext. So we couldn't directly call
ChromeGeolocationPermissionContextFactory::GetForProfile because this would be a
layering violation.

Have you seen any similar issues / solutions with other profile keyed services?

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

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

There are still a couple services that are in that situation and the "solution"
is to leave the getter as you have hear. The important part is that the Profile
no longer owns the object which you've taken care of with this CL :)

-  if (!geolocation_permission_context_.get()) {
-    geolocation_permission_context_ =
-        ChromeGeolocationPermissionContextFactory::Create(this);
-  }
-  return geolocation_permission_context_.get();
+  return ChromeGeolocationPermissionContextFactory::GetForProfile(this);
 }
 
 content::SpeechRecognitionPreferences*
 ProfileImpl::GetSpeechRecognitionPreferences() {
 #if defined(ENABLE_INPUT_SPEECH)
   return ChromeSpeechRecognitionPreferences::GetForProfile(this);
 #else
   return NULL;
 #endif
 }
@@ skipping 278 matching lines @@
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }
 
 base::Callback<ChromeURLDataManagerBackend*(void)>
     ProfileImpl::GetChromeURLDataManagerBackendGetter() const {
   return io_data_.GetChromeURLDataManagerBackendGetter();
 }