Rename ContentSettingsProviderInterface to DefaultContentSettingsProviderInterface.

chrome/browser/content_settings/host_content_settings_map.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/host_content_settings_map.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
+#include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/policy_content_settings_provider.h"
 #include "chrome/browser/content_settings/pref_content_settings_provider.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/prefs/scoped_pref_update.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 58 matching lines @@
                                 ContentSetting setting) {
   if (setting == CONTENT_SETTING_ASK &&
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay)) {
     return CONTENT_SETTING_BLOCK;
   }
   return setting;
 }
 
-typedef std::vector<linked_ptr<ContentSettingsProviderInterface> >::iterator
+typedef linked_ptr<DefaultContentSettingsProvider>
+    DefaultContentSettingsProviderPtr;
+typedef std::vector<DefaultContentSettingsProviderPtr>::iterator
     provider_iterator;
-typedef
-    std::vector<linked_ptr<ContentSettingsProviderInterface> >::const_iterator
-        const_provider_iterator;
+typedef std::vector<DefaultContentSettingsProviderPtr>::const_iterator
+    const_provider_iterator;
 
 }  // namespace
 
 
 struct HostContentSettingsMap::ExtendedContentSettings {
   ContentSettings content_settings;
   ResourceContentSettings content_settings_for_resources;
 };
 
 HostContentSettingsMap::HostContentSettingsMap(Profile* profile)
     : profile_(profile),
       is_off_the_record_(profile_->IsOffTheRecord()),
       updating_preferences_(false),
       block_third_party_cookies_(false),
       is_block_third_party_cookies_managed_(false) {
   // The order in which the content settings providers are created is critical,
   // as providers that are further down in the list (i.e. added later) override
   // providers further up.
-  content_settings_providers_.push_back(
-      linked_ptr<ContentSettingsProviderInterface>(
+  default_content_settings_providers_.push_back(
+      DefaultContentSettingsProviderPtr(
           new PrefContentSettingsProvider(profile)));
-  content_settings_providers_.push_back(
-      linked_ptr<ContentSettingsProviderInterface>(
+  default_content_settings_providers_.push_back(
+      DefaultContentSettingsProviderPtr(
           new PolicyContentSettingsProvider(profile)));
 
   PrefService* prefs = profile_->GetPrefs();
 
   MigrateObsoleteCookiePref(prefs);
 
   MigrateObsoletePopupsPref(prefs);
 
   MigrateObsoletePerhostPref(prefs);
 
@@ skipping 39 matching lines @@
   // Obsolete prefs, for migration:
   prefs->RegisterIntegerPref(prefs::kCookieBehavior,
                              net::StaticCookiePolicy::ALLOW_ALL_COOKIES);
   prefs->RegisterListPref(prefs::kPopupWhitelistedHosts);
   prefs->RegisterDictionaryPref(prefs::kPerHostContentSettings);
 }
 
 ContentSetting HostContentSettingsMap::GetDefaultContentSetting(
     ContentSettingsType content_type) const {
   ContentSetting setting = CONTENT_SETTING_DEFAULT;
-  for (const_provider_iterator provider = content_settings_providers_.begin();
-       provider != content_settings_providers_.end(); ++provider) {
+  for (const_provider_iterator provider =
+           default_content_settings_providers_.begin();
+       provider != default_content_settings_providers_.end(); ++provider) {
     if (!(*provider)->CanProvideDefaultSetting(content_type))
       continue;
     ContentSetting provided_setting =
         (*provider)->ProvideDefaultSetting(content_type);
     if (provided_setting != CONTENT_SETTING_DEFAULT)
       setting = provided_setting;
   }
   // The method GetDefaultContentSetting always has to return an explicit
   // value that is to be used as default. We here rely on the
   // PrefContentSettingProvider to always provide a value.
@@ skipping 215 matching lines @@
          CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableClickToPlay));
 
   // The default settings may not be directly modified for OTR sessions.
   // Instead, they are synced to the main profile's setting.
   if (is_off_the_record_) {
     NOTREACHED();
     return;
   }
 
-  for (provider_iterator provider = content_settings_providers_.begin();
-       provider != content_settings_providers_.end(); ++provider) {
+  for (provider_iterator provider =
+           default_content_settings_providers_.begin();
+       provider != default_content_settings_providers_.end(); ++provider) {
     (*provider)->UpdateDefaultSetting(content_type, setting);
   }
 }
 
 void HostContentSettingsMap::SetContentSetting(
     const ContentSettingsPattern& original_pattern,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     ContentSetting setting) {
   DCHECK(kTypeNames[content_type] != NULL);  // Don't call this for Geolocation.
@@ skipping 236 matching lines @@
         UserMetricsAction("BlockNonsandboxedPlugins_Disable"));
     prefs->ClearPref(prefs::kBlockNonsandboxedPlugins);
   }
 }
 
 void HostContentSettingsMap::ResetToDefaults() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   {
     AutoLock auto_lock(lock_);
-    for (provider_iterator provider = content_settings_providers_.begin();
-         provider != content_settings_providers_.end(); ++provider) {
+    for (provider_iterator provider =
+             default_content_settings_providers_.begin();
+         provider != default_content_settings_providers_.end(); ++provider) {
       (*provider)->ResetToDefaults();
     }
     host_content_settings_.clear();
     off_the_record_settings_.clear();
     // Don't reset block third party cookies if they are managed.
     if (!IsBlockThirdPartyCookiesManaged())
       block_third_party_cookies_ = false;
     block_nonsandboxed_plugins_ = false;
   }
 
@@ skipping 122 matching lines @@
     const ExtendedContentSettings& settings) const {
   for (size_t i = 0; i < arraysize(settings.content_settings.settings); ++i) {
     if (settings.content_settings.settings[i] != CONTENT_SETTING_DEFAULT)
       return false;
   }
   return settings.content_settings_for_resources.empty();
 }
 
 bool HostContentSettingsMap::IsDefaultContentSettingManaged(
     ContentSettingsType content_type) const {
-  for (const_provider_iterator provider = content_settings_providers_.begin();
-       provider != content_settings_providers_.end(); ++provider) {
+  for (const_provider_iterator provider =
+           default_content_settings_providers_.begin();
+       provider != default_content_settings_providers_.end(); ++provider) {
     if ((*provider)->DefaultSettingIsManaged(content_type))
       return true;
   }
   return false;
 }
 
 void HostContentSettingsMap::ReadExceptions(bool overwrite) {
   AutoLock lock(lock_);
 
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 140 matching lines @@
   }
 
   for (size_t i = 0; i < move_items.size(); ++i) {
     Value* pattern_settings_dictionary = NULL;
     all_settings_dictionary->RemoveWithoutPathExpansion(
         move_items[i].first, &pattern_settings_dictionary);
     all_settings_dictionary->SetWithoutPathExpansion(
         move_items[i].second, pattern_settings_dictionary);
   }
 }