Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 291 matching lines @@
                     secondary_pattern,
                     content_type,
                     resource_identifier,
                     value);
 }
 
 void HostContentSettingsMap::AddExceptionForURL(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
-    const std::string& resource_identifier,
     ContentSetting setting) {
   // TODO(markusheintz): Until the UI supports pattern pairs, both urls must
   // match.
   DCHECK(primary_url == secondary_url);
   DCHECK(!ContentTypeHasCompoundValue(content_type));
 
   // Make sure there is no entry that would override the pattern we are about
   // to insert for exactly this URL.
   SetContentSetting(ContentSettingsPattern::FromURLNoWildcard(primary_url),
                     ContentSettingsPattern::Wildcard(),
                     content_type,
-                    resource_identifier,
+                    std::string(),
                     CONTENT_SETTING_DEFAULT);
 
   SetContentSetting(ContentSettingsPattern::FromURL(primary_url),
                     ContentSettingsPattern::Wildcard(),
                     content_type,
-                    resource_identifier,
+                    std::string(),
                     setting);
 }
 
 void HostContentSettingsMap::ClearSettingsForOneType(
     ContentSettingsType content_type) {
   UsedContentSettingsProviders();
   for (ProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
     provider->second->ClearAllContentSettingsRules(content_type);
@@ skipping 272 matching lines @@
     HostContentSettingsMap::GetProviderTypeFromSource(
         const std::string& source) {
   for (size_t i = 0; i < arraysize(kProviderNames); ++i) {
     if (source == kProviderNames[i])
       return static_cast<ProviderType>(i);
   }
 
   NOTREACHED();
   return DEFAULT_PROVIDER;
 }