Profiles: Really fix refcounted services.

chrome/browser/plugin_prefs.cc

Index: chrome/browser/plugin_prefs.cc
diff --git a/chrome/browser/plugin_prefs.cc b/chrome/browser/plugin_prefs.cc
index 4796b89df3881f82069c3c96374c27e23721d76b..6b1264b28ed069646533c2598cc91ad70b3c10f6 100644
--- a/chrome/browser/plugin_prefs.cc
+++ b/chrome/browser/plugin_prefs.cc
@@ -52,16 +52,16 @@ base::LazyInstance<std::map<FilePath, bool> > g_default_plugin_state =
 #define kPluginUpdateDelayMs (60 * 1000)
 
 // static
-PluginPrefs* PluginPrefs::GetForProfile(Profile* profile) {
-  return PluginPrefsFactory::GetInstance()->GetPrefsForProfile(profile);
+scoped_refptr<PluginPrefs> PluginPrefs::GetForProfile(Profile* profile) {
+  return PluginPrefsFactory::GetPrefsForProfile(profile);
 }
 
 // static
-PluginPrefs* PluginPrefs::GetForTestingProfile(Profile* profile) {
-  ProfileKeyedBase* prefs =
+scoped_refptr<PluginPrefs> PluginPrefs::GetForTestingProfile(
+    Profile* profile) {
+  return static_cast<PluginPrefs*>(
       PluginPrefsFactory::GetInstance()->SetTestingFactoryAndUse(
-          profile, &PluginPrefsFactory::CreatePrefsForProfile);
-  return static_cast<PluginPrefs*>(prefs);
+          profile, &PluginPrefsFactory::CreateForTestingProfile).get());
 }
 
 void PluginPrefs::SetPluginListForTesting(