Use empty resource identifier unless --enable-resource-content-settings is set.

chrome/browser/content_settings/content_settings_pref_provider.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/content_settings_pref_provider.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 440 matching lines @@
   if (value)
     return ValueToContentSetting(value);
 
   return CONTENT_SETTING_DEFAULT;
 }
 
 void PrefProvider::GetAllContentSettingsRules(
       ContentSettingsType content_type,
       const ResourceIdentifier& resource_identifier,
       Rules* content_setting_rules) const {
-  DCHECK_NE(RequiresResourceIdentifier(content_type),
-            resource_identifier.empty());
   DCHECK(content_setting_rules);
   content_setting_rules->clear();
 
   const OriginIdentifierValueMap* map_to_return =
       is_incognito_ ? &incognito_value_map_ : &value_map_;
 
   base::AutoLock auto_lock(lock_);
   for (OriginIdentifierValueMap::const_iterator entry = map_to_return->begin();
        entry != map_to_return->end();
        ++entry) {
@@ skipping 13 matching lines @@
     const ContentSettingsPattern& requesting_pattern,
     const ContentSettingsPattern& embedding_pattern,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     ContentSetting setting) {
   // Support for embedding_patterns is not implemented yet.
   DCHECK(requesting_pattern == embedding_pattern);
 
   DCHECK(kTypeNames[content_type] != NULL);  // Don't call this for Geolocation.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK_NE(RequiresResourceIdentifier(content_type),
-            resource_identifier.empty());
-  DCHECK(content_type != CONTENT_SETTINGS_TYPE_PLUGINS ||
-         setting != CONTENT_SETTING_ASK ||
-         CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnableClickToPlay));
 
   updating_preferences_ = true;
   {
     DictionaryPrefUpdate update(profile_ ? profile_->GetPrefs() : NULL,
                                 prefs::kContentSettingsPatterns);
     DictionaryValue* all_settings_dictionary = NULL;
 
     OriginIdentifierValueMap* map_to_modify = &incognito_value_map_;
     if (!is_incognito_) {
       map_to_modify = &value_map_;
@@ skipping 433 matching lines @@
                         ContentSettingsPattern::FromString(host),
                         CONTENT_SETTINGS_TYPE_POPUPS,
                         "",
                         CONTENT_SETTING_ALLOW);
     }
     prefs->ClearPref(prefs::kPopupWhitelistedHosts);
   }
 }
 
 }  // namespace content_settings