Profiles: Really fix refcounted services.

chrome/browser/content_settings/cookie_settings.cc

Index: chrome/browser/content_settings/cookie_settings.cc
diff --git a/chrome/browser/content_settings/cookie_settings.cc b/chrome/browser/content_settings/cookie_settings.cc
index 46a580ec071a7e992402187d7cbfb90c6864c222..742cc7308679279bdb50997e736a3f8e890dfa5c 100644
--- a/chrome/browser/content_settings/cookie_settings.cc
+++ b/chrome/browser/content_settings/cookie_settings.cc
@@ -44,10 +44,11 @@ bool IsAllowed(ContentSetting setting) {
 }  // 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
@@ -73,7 +74,7 @@ bool CookieSettings::Factory::ServiceRedirectedInIncognito() {
   return true;
 }
 
-RefcountedProfileKeyedService*
+scoped_refptr<RefcountedProfileKeyedService>
 CookieSettings::Factory::BuildServiceInstanceFor(Profile* profile) const {
   return new CookieSettings(profile->GetHostContentSettingsMap(),
                             profile->GetPrefs());