Add ContentSettingsProvider Interface.

chrome/browser/content_settings/host_content_settings_map.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/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"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/base/static_cookie_policy.h"
 
+using content_settings::DefaultContentSettingsProvider;
+using content_settings::PrefDefaultContentSettingsProvider;
+using content_settings::PolicyDefaultContentSettingsProvider;
+
 namespace {
 
 // The preference keys where resource identifiers are stored for
 // ContentSettingsType values that support resource identifiers.
 const char* kResourceTypeNames[CONTENT_SETTINGS_NUM_TYPES] = {
   NULL,
   NULL,
   NULL,
   "per_plugin",
   NULL,
@@ skipping 68 matching lines @@
     : 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.
   default_content_settings_providers_.push_back(
       DefaultContentSettingsProviderPtr(
-          new PrefContentSettingsProvider(profile)));
+          new PrefDefaultContentSettingsProvider(profile)));
   default_content_settings_providers_.push_back(
       DefaultContentSettingsProviderPtr(
-          new PolicyContentSettingsProvider(profile)));
+          new PolicyDefaultContentSettingsProvider(profile)));
 
   PrefService* prefs = profile_->GetPrefs();
 
   MigrateObsoleteCookiePref(prefs);
 
   MigrateObsoletePopupsPref(prefs);
 
   MigrateObsoletePerhostPref(prefs);
 
   // Read misc. global settings.
@@ skipping 843 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);
   }
 }