Profiles: Really fix refcounted services.

chrome/browser/content_settings/cookie_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_
 #pragma once
 
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service.h"
 #include "chrome/browser/profiles/refcounted_profile_keyed_service_factory.h"
 #include "chrome/common/content_settings.h"
 #include "content/public/browser/notification_observer.h"
 
 class ContentSettingsPattern;
@@ skipping 88 matching lines @@
       bool setting_cookie,
       content_settings::SettingSource* source) const;
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   class Factory : public RefcountedProfileKeyedServiceFactory {
    public:
     // Returns the |CookieSettings| associated with the |profile|.
     //
     // This should only be called on the UI thread.
-    static CookieSettings* GetForProfile(Profile* profile);
+    static scoped_refptr<CookieSettings> GetForProfile(Profile* profile);
 
     static Factory* GetInstance();
 
    private:
     friend struct DefaultSingletonTraits<Factory>;
 
     Factory();
     virtual ~Factory();
 
     // |ProfileKeyedBaseFactory| methods:
     virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE;
     virtual bool ServiceRedirectedInIncognito() OVERRIDE;
-    virtual RefcountedProfileKeyedService* BuildServiceInstanceFor(
-        Profile* profile) const OVERRIDE;
+    virtual scoped_refptr<RefcountedProfileKeyedService>
+        BuildServiceInstanceFor(Profile* profile) const OVERRIDE;
   };
 
  private:
   // Returns true if the "block third party cookies" preference is set.
   //
   // This method may be called on any thread.
   bool ShouldBlockThirdPartyCookies() const;
 
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   PrefChangeRegistrar pref_change_registrar_;
 
   // Used around accesses to |block_third_party_cookies_| to guarantee thread
   // safety.
   mutable base::Lock lock_;
 
   bool block_third_party_cookies_;
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_COOKIE_SETTINGS_H_