Make ExtensionContentSettingsStore refcounted.

chrome/browser/extensions/extension_content_settings_store.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ skipping 36 matching lines @@
   ContentSettingSpecList incognito_persistent_settings;
   // Session-only incognito content settings.
   ContentSettingSpecList incognito_session_only_settings;
 };
 
 ExtensionContentSettingsStore::ExtensionContentSettingsStore() {
   DCHECK(OnCorrectThread());
 }
 
 ExtensionContentSettingsStore::~ExtensionContentSettingsStore() {
-  DCHECK(OnCorrectThread());
-  NotifyOfDestruction();
   STLDeleteValues(&entries_);
 }
 
 void ExtensionContentSettingsStore::SetExtensionContentSetting(
     const std::string& ext_id,
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType type,
     const content_settings::ResourceIdentifier& identifier,
     ContentSetting setting,
@@ skipping 358 matching lines @@
     ContentSettingsType type,
     const content_settings::ResourceIdentifier& identifier,
     ContentSetting setting)
     : primary_pattern(primary_pattern),
       secondary_pattern(secondary_pattern),
       content_type(type),
       resource_identifier(identifier),
       setting(setting) {
 }
 
-void ExtensionContentSettingsStore::NotifyOfDestruction() {
-  FOR_EACH_OBSERVER(ExtensionContentSettingsStore::Observer,
-                    observers_,
-                    OnDestruction());
-}
-
 void ExtensionContentSettingsStore::NotifyOfContentSettingChanged(
     const std::string& extension_id,
     bool incognito) {
   FOR_EACH_OBSERVER(
       ExtensionContentSettingsStore::Observer,
       observers_,
       OnContentSettingChanged(extension_id, incognito));
 }
 
 bool ExtensionContentSettingsStore::OnCorrectThread() {
   // If there is no UI thread, we're most likely in a unit test.
   return !BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI);
 }