1 files changed, 3 insertions, 62 deletions

diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc
index b76fd31..d11ca9b 100644
--- a/components/content_settings/core/browser/host_content_settings_map.cc
+++ b/components/content_settings/core/browser/host_content_settings_map.cc
@@ -40,7 +40,6 @@ const char* kProviderNames[] = {
   "policy",
   "supervised_user",
   "extension",
-  "override",
   "preference",
   "default"
 };
@@ -62,7 +61,6 @@ content_settings::SettingSource kProviderSourceMap[] = {
   content_settings::SETTING_SOURCE_EXTENSION,
   content_settings::SETTING_SOURCE_USER,
   content_settings::SETTING_SOURCE_USER,
-  content_settings::SETTING_SOURCE_USER,
 };
 static_assert(arraysize(kProviderSourceMap) ==
                    HostContentSettingsMap::NUM_PROVIDER_TYPES,
@@ -98,9 +96,6 @@ HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
       new content_settings::DefaultProvider(prefs_, is_off_the_record_);
   default_provider->AddObserver(this);
   content_settings_providers_[DEFAULT_PROVIDER] = default_provider;
-
-  content_settings_providers_[OVERRIDE_PROVIDER] =
-      new content_settings::OverrideProvider(prefs_, is_off_the_record_);
 }
 
 // static
@@ -112,7 +107,6 @@ void HostContentSettingsMap::RegisterProfilePrefs(
   content_settings::DefaultProvider::RegisterProfilePrefs(registry);
   content_settings::PrefProvider::RegisterProfilePrefs(registry);
   content_settings::PolicyProvider::RegisterProfilePrefs(registry);
-  content_settings::OverrideProvider::RegisterProfilePrefs(registry);
 }
 
 void HostContentSettingsMap::RegisterProvider(
@@ -160,8 +154,7 @@ ContentSetting HostContentSettingsMap::GetDefaultContentSetting(
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
-    if (provider->first == PREF_PROVIDER ||
-        provider->first == OVERRIDE_PROVIDER)
+    if (provider->first == PREF_PROVIDER)
       continue;
     ContentSetting default_setting =
         GetDefaultContentSettingFromProvider(content_type, provider->second);
@@ -199,8 +192,6 @@ void HostContentSettingsMap::GetSettingsForOneType(
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
-    if (provider->first == OVERRIDE_PROVIDER)
-      continue;
     // For each provider, iterate first the incognito-specific rules, then the
     // normal rules.
     if (is_off_the_record_) {
@@ -375,52 +366,6 @@ base::Time HostContentSettingsMap::GetLastUsageByPattern(
       primary_pattern, secondary_pattern, content_type);
 }
 
-ContentSetting HostContentSettingsMap::GetContentSettingWithoutOverride(
-    const GURL& primary_url,
-    const GURL& secondary_url,
-    ContentSettingsType content_type,
-    const std::string& resource_identifier) {
-  scoped_ptr<base::Value> value(GetWebsiteSettingWithoutOverride(
-      primary_url, secondary_url, content_type, resource_identifier, NULL));
-  return content_settings::ValueToContentSetting(value.get());
-}
-
-scoped_ptr<base::Value>
-HostContentSettingsMap::GetWebsiteSettingWithoutOverride(
-    const GURL& primary_url,
-    const GURL& secondary_url,
-    ContentSettingsType content_type,
-    const std::string& resource_identifier,
-    content_settings::SettingInfo* info) const {
-  return GetWebsiteSettingInternal(primary_url,
-                                   secondary_url,
-                                   content_type,
-                                   resource_identifier,
-                                   info,
-                                   false);
-}
-
-void HostContentSettingsMap::SetContentSettingOverride(
-    ContentSettingsType content_type,
-    bool is_enabled) {
-  UsedContentSettingsProviders();
-
-  content_settings::OverrideProvider* override =
-      static_cast<content_settings::OverrideProvider*>(
-          content_settings_providers_[OVERRIDE_PROVIDER]);
-  override->SetOverrideSetting(content_type, is_enabled);
-}
-
-bool HostContentSettingsMap::GetContentSettingOverride(
-    ContentSettingsType content_type) {
-  UsedContentSettingsProviders();
-
-  content_settings::OverrideProvider* override =
-      static_cast<content_settings::OverrideProvider*>(
-          content_settings_providers_[OVERRIDE_PROVIDER]);
-  return override->IsEnabled(content_type);
-}
-
 void HostContentSettingsMap::AddObserver(content_settings::Observer* observer) {
   observers_.AddObserver(observer);
 }
@@ -711,8 +656,7 @@ scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSetting(
                                    secondary_url,
                                    content_type,
                                    resource_identifier,
-                                   info,
-                                   true);
+                                   info);
 }
 
 // static
@@ -737,8 +681,7 @@ scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
-    content_settings::SettingInfo* info,
-    bool get_override) const {
+    content_settings::SettingInfo* info) const {
   // TODO(msramek): MEDIASTREAM is deprecated. Remove this check when all
   // references to MEDIASTREAM are removed from the code.
   DCHECK_NE(CONTENT_SETTINGS_TYPE_MEDIASTREAM, content_type);
@@ -756,8 +699,6 @@ scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
-    if (!get_override && provider->first == OVERRIDE_PROVIDER)
-      continue;
 
     scoped_ptr<base::Value> value(
         content_settings::GetContentSettingValueAndPatterns(provider->second,