Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsProvider.

chrome/browser/content_settings/content_settings_extension_provider.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/content_settings/content_settings_extension_provider.h"
 
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 
@@ skipping 11 matching lines @@
 }
 
 ContentSetting ExtensionProvider::GetContentSetting(
     const GURL& embedded_url,
     const GURL& top_level_url,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier) const {
   // TODO(markusheintz): Instead of getting the effective setting every time
   // effective patterns could be cached in here.
   DCHECK(extensions_settings_);
-  return extensions_settings_->GetEffectiveContentSetting(
+  ContentSetting setting = extensions_settings_->GetEffectiveContentSetting(
       embedded_url,
       top_level_url,
       content_type,
       resource_identifier,
       incognito_);
+

[battre, 2011/08/29 17:44:04]

nit: is this really better?

[markusheintz_, 2011/08/30 15:14:02]

Ahhhh no not at all. I just did this to LOG the setting for debbung purposes.
Then I happiely removed the LOG(ERROR) without changing this back. *grrrr* to
myself.

+  return setting;
 }
 
 void ExtensionProvider::GetAllContentSettingsRules(
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     Rules* content_setting_rules) const {
   return extensions_settings_->GetContentSettingsForContentType(
       content_type, resource_identifier, incognito_, content_setting_rules);
 }
 
 void ExtensionProvider::ShutdownOnUIThread() {
   RemoveAllObservers();
   extensions_settings_->RemoveObserver(this);
 }
 
 void ExtensionProvider::OnContentSettingChanged(
     const std::string& extension_id,
     bool incognito) {
   if (incognito_ != incognito)
     return;
   // TODO(markusheintz): Be more concise.
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   CONTENT_SETTINGS_TYPE_DEFAULT,
                   std::string());
 }
 
 }  // namespace content_settings