Make ExtensionContentSettingsStore refcounted.

chrome/browser/extensions/extension_content_settings_store_unittest.cc

Index: chrome/browser/extensions/extension_content_settings_store_unittest.cc
diff --git a/chrome/browser/extensions/extension_content_settings_store_unittest.cc b/chrome/browser/extensions/extension_content_settings_store_unittest.cc
index 8473f3d6393b1835d881fbf8ceddc2f06c473496..cd549e85f9342c4bf607753378677f25eb1d08a3 100644
--- a/chrome/browser/extensions/extension_content_settings_store_unittest.cc
+++ b/chrome/browser/extensions/extension_content_settings_store_unittest.cc
@@ -29,7 +29,6 @@ class MockExtensionContentSettingsStoreObserver
  public:
   MOCK_METHOD2(OnContentSettingChanged,
                void(const std::string& extension_id, bool incognito));
-  MOCK_METHOD0(OnDestruction, void());
 };
 
 }
@@ -39,100 +38,100 @@ TEST(ExtensionContentSettingsStoreTest, RegisterUnregister) {
 
   ::testing::StrictMock<MockExtensionContentSettingsStoreObserver> observer;
 
-  ExtensionContentSettingsStore map;
-  map.AddObserver(&observer);
+  scoped_refptr<ExtensionContentSettingsStore> map(
+      new ExtensionContentSettingsStore());
+  map->AddObserver(&observer);
 
   GURL url("http://www.youtube.com");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
 
   // Register first extension
   std::string ext_id("my_extension");
   base::Time time_1 = timer.GetNext();
-  map.RegisterExtension(ext_id, time_1, true);
+  map->RegisterExtension(ext_id, time_1, true);
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
 
   // Set setting
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromURL(GURL("http://www.youtube.com"));
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id, false));
-  map.SetExtensionContentSetting(
-      ext_id,
-      pattern,
-      pattern,
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      "",
-      CONTENT_SETTING_ALLOW,
-      kExtensionPrefsScopeRegular);
+  map->SetExtensionContentSetting(
+       ext_id,
+       pattern,
+       pattern,
+        CONTENT_SETTINGS_TYPE_COOKIES,
+       "",
+       CONTENT_SETTING_ALLOW,
+       kExtensionPrefsScopeRegular);
   Mock::VerifyAndClear(&observer);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
 
   // Register second extension.
   std::string ext_id_2("my_second_extension");
   base::Time time_2 = timer.GetNext();
-  map.RegisterExtension(ext_id_2, time_2, true);
+  map->RegisterExtension(ext_id_2, time_2, true);
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id_2, false));
-  map.SetExtensionContentSetting(
-      ext_id_2,
-      pattern,
-      pattern,
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      "",
-      CONTENT_SETTING_BLOCK,
-      kExtensionPrefsScopeRegular);
+  map->SetExtensionContentSetting(
+       ext_id_2,
+       pattern,
+       pattern,
+       CONTENT_SETTINGS_TYPE_COOKIES,
+       "",
+       CONTENT_SETTING_BLOCK,
+       kExtensionPrefsScopeRegular);
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
 
   // Unregister first extension. This shouldn't change the setting.
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id, false));
-  map.UnregisterExtension(ext_id);
+  map->UnregisterExtension(ext_id);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
   Mock::VerifyAndClear(&observer);
 
   // Unregister second extension. This should reset the setting to its default
   // value.
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id_2, false));
-  map.UnregisterExtension(ext_id_2);
+  map->UnregisterExtension(ext_id_2);
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            map.GetEffectiveContentSetting(
-                url,
-                url,
-                CONTENT_SETTINGS_TYPE_COOKIES,
-                "",
-                false));
-  Mock::VerifyAndClear(&observer);
-
-  EXPECT_CALL(observer, OnDestruction());
+            map->GetEffectiveContentSetting(
+                 url,
+                 url,
+                 CONTENT_SETTINGS_TYPE_COOKIES,
+                 "",
+                 false));
+
+  map->RemoveObserver(&observer);
 }