Add content_settings::PolicyProvider and a set of new policies to managed content settings.

chrome/browser/content_settings/content_settings_base_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_base_provider.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 54 matching lines @@
 }
 
 ContentSetting BaseProvider::GetContentSetting(
     const GURL& requesting_url,
     const GURL& embedding_url,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier) const {
   // Support for embedding_patterns is not implemented yet.
   DCHECK(requesting_url == embedding_url);
 
-  if (!RequiresResourceIdentifier(content_type))
+  if (!RequiresResourceIdentifier(content_type) ||
+      (RequiresResourceIdentifier(content_type) && resource_identifier.empty()))
     return GetNonDefaultContentSettings(requesting_url).settings[content_type];
 
-  if (RequiresResourceIdentifier(content_type) && resource_identifier.empty())
-    return CONTENT_SETTING_DEFAULT;
-
-  // TODO(markusheintz) Remove this DCHECK.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableResourceContentSettings)) {
-    DCHECK(!resource_identifier.empty());
-  }
-
   // Resolve content settings with resource identifier.
   // 1. Check for pattern that exactly match the url/host
   //     1.1 In the content-settings-map
   //     1.2 In the off_the_record content-settings-map
   // 3. Shorten the url subdomain by subdomain and try to find a pattern in
   //     3.1 OTR content-settings-map
   //     3.2 content-settings-map
   base::AutoLock auto_lock(lock_);
   const std::string host(net::GetHostOrSpecFromURL(requesting_url));
   ContentSettingsTypeResourceIdentifierPair
@@ skipping 46 matching lines @@
               next_dot - ContentSettingsPattern::kDomainWildcardLength + 1);
   }
 
   return CONTENT_SETTING_DEFAULT;
 }
 
 void BaseProvider::GetAllContentSettingsRules(
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     Rules* content_setting_rules) const {
-  DCHECK(RequiresResourceIdentifier(content_type) !=
-         resource_identifier.empty());
   DCHECK(content_setting_rules);
   content_setting_rules->clear();
 
   const HostContentSettings* map_to_return =
       is_off_the_record_ ? &off_the_record_settings_ : &host_content_settings_;
   ContentSettingsTypeResourceIdentifierPair requested_setting(
       content_type, resource_identifier);
 
   base::AutoLock auto_lock(lock_);
   for (HostContentSettings::const_iterator i(map_to_return->begin());
@@ skipping 65 matching lines @@
         key.find('.', ContentSettingsPattern::kDomainWildcardLength);
     if (next_dot == std::string::npos)
       break;
     key.erase(ContentSettingsPattern::kDomainWildcardLength,
               next_dot - ContentSettingsPattern::kDomainWildcardLength + 1);
   }
 
   return output;
 }
 
+void BaseProvider::UpdateContentSettingsMap(
+    const ContentSettingsPattern& requesting_pattern,
+    const ContentSettingsPattern& embedding_pattern,
+    ContentSettingsType content_type,
+    const ResourceIdentifier& resource_identifier,
+    ContentSetting content_setting) {
+  std::string pattern_str(requesting_pattern.CanonicalizePattern());
+  HostContentSettings* content_settings_map = host_content_settings();
+  ExtendedContentSettings& extended_settings =
+      (*content_settings_map)[pattern_str];
+  extended_settings.content_settings.settings[content_type] = content_setting;
+}
+
 // static
 ContentSetting BaseProvider::ClickToPlayFixup(ContentSettingsType content_type,
                                               ContentSetting setting) {
   if (setting == CONTENT_SETTING_ASK &&
       content_type == CONTENT_SETTINGS_TYPE_PLUGINS &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClickToPlay)) {
     return CONTENT_SETTING_BLOCK;
   }
   return setting;
 }
 
 }  // namespace content_settings