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>(
+      linked_ptr<DefaultContentSettingsProvider>(

[jochen (gone - plz use gerrit), 2011/01/25 14:31:55]

DefaultContentSettingsProviderPtr

[markusheintz_, 2011/01/25 14:46:22]

Done.

           new PrefContentSettingsProvider(profile)));
   content_settings_providers_.push_back(
-      linked_ptr<ContentSettingsProviderInterface>(
+      linked_ptr<DefaultContentSettingsProvider>(
           new PolicyContentSettingsProvider(profile)));
 
   PrefService* prefs = profile_->GetPrefs();
 
   MigrateObsoleteCookiePref(prefs);
 
   MigrateObsoletePopupsPref(prefs);
 
   MigrateObsoletePerhostPref(prefs);
 
@@ skipping 840 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);
   }
 }