Profiles: Really fix refcounted services.

chrome/browser/plugin_prefs_factory.h

Index: chrome/browser/plugin_prefs_factory.h
diff --git a/chrome/browser/plugin_prefs_factory.h b/chrome/browser/plugin_prefs_factory.h
index e29dd9d1782782921c29f464597c9f506cee91bd..c45d9d1db709396048f9fd01af6e62f8151e4754 100644
--- a/chrome/browser/plugin_prefs_factory.h
+++ b/chrome/browser/plugin_prefs_factory.h
@@ -17,20 +17,23 @@ class ProfileKeyedService;
 
 class PluginPrefsFactory : public RefcountedProfileKeyedServiceFactory {
  public:
-  static PluginPrefsFactory* GetInstance();
-
-  PluginPrefs* GetPrefsForProfile(Profile* profile);
+  static scoped_refptr<PluginPrefs> GetPrefsForProfile(Profile* profile);
 
-  static ProfileKeyedBase* CreatePrefsForProfile(Profile* profile);
+  static PluginPrefsFactory* GetInstance();
 
  private:
+  friend class PluginPrefs;
   friend struct DefaultSingletonTraits<PluginPrefsFactory>;
 
+  // Helper method for PluginPrefs::GetForTestingProfile.
+  static scoped_refptr<RefcountedProfileKeyedService> CreateForTestingProfile(
+      Profile* profile);
+
   PluginPrefsFactory();
   virtual ~PluginPrefsFactory();
 
   // RefcountedProfileKeyedServiceFactory methods:
-  virtual RefcountedProfileKeyedService* BuildServiceInstanceFor(
+  virtual scoped_refptr<RefcountedProfileKeyedService> BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 
   // ProfileKeyedServiceFactory methods: