Profiles: Really fix refcounted services.

chrome/browser/content_settings/cookie_settings.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/content_settings/cookie_settings.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 26 matching lines @@
 
 bool IsAllowed(ContentSetting setting) {
   DCHECK(IsValidSetting(setting));
   return (setting == CONTENT_SETTING_ALLOW ||
           setting == CONTENT_SETTING_SESSION_ONLY);
 }
 
 }  // namespace
 
 // static
-CookieSettings* CookieSettings::Factory::GetForProfile(Profile* profile) {
+scoped_refptr<CookieSettings> CookieSettings::Factory::GetForProfile(
+    Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return static_cast<CookieSettings*>(
-      GetInstance()->GetBaseForProfile(profile, true));
+      GetInstance()->GetServiceForProfile(profile, true).get());
 }
 
 // static
 CookieSettings::Factory* CookieSettings::Factory::GetInstance() {
   return Singleton<CookieSettings::Factory>::get();
 }
 
 CookieSettings::Factory::Factory()
     : RefcountedProfileKeyedServiceFactory(
         "CookieSettings",
         ProfileDependencyManager::GetInstance()) {
 }
 
 CookieSettings::Factory::~Factory() {}
 
 void CookieSettings::Factory::RegisterUserPrefs(PrefService* user_prefs) {
   user_prefs->RegisterBooleanPref(prefs::kBlockThirdPartyCookies,
                                   false,
                                   PrefService::SYNCABLE_PREF);
 }
 
 bool CookieSettings::Factory::ServiceRedirectedInIncognito() {
   return true;
 }
 
-RefcountedProfileKeyedService*
+scoped_refptr<RefcountedProfileKeyedService>
 CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const {
   return new CookieSettings(profile->GetHostContentSettingsMap(),
                             profile->GetPrefs());
 }
 
 CookieSettings::CookieSettings(
     HostContentSettingsMap* host_content_settings_map,
     PrefService* prefs)
     : host_content_settings_map_(host_content_settings_map),
       block_third_party_cookies_(
@@ skipping 136 matching lines @@
 
   // We should always have a value, at least from the default provider.
   DCHECK(value.get());
   return content_settings::ValueToContentSetting(value.get());
 }
 
 bool CookieSettings::ShouldBlockThirdPartyCookies() const {
   base::AutoLock auto_lock(lock_);
   return block_third_party_cookies_;
 }