Add a global on/off switch for content settings and expose a toggle on the Website Settings options…

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 41 matching lines @@
 
 typedef std::vector<content_settings::Rule> Rules;
 
 typedef std::pair<std::string, std::string> StringPair;
 
 // TODO(bauerb): Expose constants.
 const char* kProviderNames[] = {
   "platform_app",
   "policy",
   "extension",
+  "override",
   "preference",
   "default"
 };
 
 content_settings::SettingSource kProviderSourceMap[] = {
   content_settings::SETTING_SOURCE_EXTENSION,
   content_settings::SETTING_SOURCE_POLICY,
   content_settings::SETTING_SOURCE_EXTENSION,
   content_settings::SETTING_SOURCE_USER,
   content_settings::SETTING_SOURCE_USER,
+  content_settings::SETTING_SOURCE_USER,
 };
 COMPILE_ASSERT(arraysize(kProviderSourceMap) ==
                    HostContentSettingsMap::NUM_PROVIDER_TYPES,
                kProviderSourceMap_has_incorrect_size);
 
 // Returns true if the |content_type| supports a resource identifier.
 // Resource identifiers are supported (but not required) for plug-ins.
 bool SupportsResourceIdentifier(ContentSettingsType content_type) {
   return content_type == CONTENT_SETTINGS_TYPE_PLUGINS;
 }
 
 }  // namespace
 
-HostContentSettingsMap::HostContentSettingsMap(
-    PrefService* prefs,
-    bool incognito) :
+HostContentSettingsMap::HostContentSettingsMap(PrefService* prefs,
+                                               bool incognito)
+    :
 #ifndef NDEBUG
       used_from_thread_id_(base::PlatformThread::CurrentId()),
 #endif
       prefs_(prefs),
       is_off_the_record_(incognito) {
   content_settings::ObservableProvider* policy_provider =
       new content_settings::PolicyProvider(prefs_);
   policy_provider->AddObserver(this);
   content_settings_providers_[POLICY_PROVIDER] = policy_provider;
 
   content_settings::ObservableProvider* pref_provider =
       new content_settings::PrefProvider(prefs_, is_off_the_record_);
   pref_provider->AddObserver(this);
   content_settings_providers_[PREF_PROVIDER] = pref_provider;
 
   content_settings::ObservableProvider* default_provider =
       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_);
+
   if (!is_off_the_record_) {
     // Migrate obsolete preferences.
     MigrateObsoleteClearOnExitPref();
   }
 }
 
 #if defined(ENABLE_EXTENSIONS)
 void HostContentSettingsMap::RegisterExtensionService(
     ExtensionService* extension_service) {
   DCHECK(extension_service);
@@ skipping 36 matching lines @@
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kContentSettingsClearOnExitMigrated,
       false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 
   // Register the prefs for the content settings providers.
   content_settings::DefaultProvider::RegisterProfilePrefs(registry);
   content_settings::PrefProvider::RegisterProfilePrefs(registry);
   content_settings::PolicyProvider::RegisterProfilePrefs(registry);
+  content_settings::OverrideProvider::RegisterProfilePrefs(registry);
 }
 
 ContentSetting HostContentSettingsMap::GetDefaultContentSettingFromProvider(
     ContentSettingsType content_type,
     content_settings::ProviderInterface* provider) const {
   scoped_ptr<content_settings::RuleIterator> rule_iterator(
       provider->GetRuleIterator(content_type, std::string(), false));
 
   ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
   while (rule_iterator->HasNext()) {
     content_settings::Rule rule = rule_iterator->Next();
     if (rule.primary_pattern == wildcard &&
         rule.secondary_pattern == wildcard) {
       return content_settings::ValueToContentSetting(rule.value.get());
     }
   }
   return CONTENT_SETTING_DEFAULT;
 }
 
 ContentSetting HostContentSettingsMap::GetDefaultContentSetting(
     ContentSettingsType content_type,
     std::string* provider_id) const {
   UsedContentSettingsProviders();
 
   // Iterate through the list of providers and return the first non-NULL value
   // that matches |primary_url| and |secondary_url|.
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
-    if (provider->first == PREF_PROVIDER)
+    if (provider->first == PREF_PROVIDER ||
+        provider->first == OVERRIDE_PROVIDER)
       continue;
     ContentSetting default_setting =
         GetDefaultContentSettingFromProvider(content_type, provider->second);
     if (default_setting != CONTENT_SETTING_DEFAULT) {
       if (provider_id)
         *provider_id = kProviderNames[provider->first];
       return default_setting;
     }
   }
 
   // The method GetDefaultContentSetting always has to return an explicit
   // value that is to be used as default. We here rely on the
   // DefaultProvider to always provide a value.
   NOTREACHED();
   return CONTENT_SETTING_DEFAULT;
 }
 
 ContentSetting HostContentSettingsMap::GetContentSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier) const {
   DCHECK(!ContentTypeHasCompoundValue(content_type));
-  scoped_ptr<base::Value> value(GetWebsiteSetting(
-      primary_url, secondary_url, content_type, resource_identifier, NULL));
+  scoped_ptr<base::Value> value = GetWebsiteSetting(
+      primary_url, secondary_url, content_type, resource_identifier, NULL);
   return content_settings::ValueToContentSetting(value.get());
 }
 
 void HostContentSettingsMap::GetSettingsForOneType(
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     ContentSettingsForOneType* settings) const {
   DCHECK(SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
   DCHECK(settings);
   UsedContentSettingsProviders();
 
   settings->clear();
   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_) {
       AddSettingsForOneType(provider->second,
                             provider->first,
                             content_type,
                             resource_identifier,
                             settings,
                             true);
     }
@@ skipping 29 matching lines @@
     const std::string& resource_identifier,
     base::Value* value) {
   DCHECK(IsValueAllowedForType(prefs_, value, content_type));
   DCHECK(SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
   UsedContentSettingsProviders();
 
   for (ProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
+    if (provider->first == OVERRIDE_PROVIDER)

[Bernhard Bauer, 2014/09/11 16:49:56]

If you use a new method to change overrides, you can simply return false in your
implementation of SetWebsiteSetting.

[Daniel Nishi, 2014/09/11 20:58:12]

Done.

+      continue;
     if (provider->second->SetWebsiteSetting(primary_pattern,
                                             secondary_pattern,
                                             content_type,
                                             resource_identifier,
                                             value)) {
       return;
     }
   }
   NOTREACHED();
 }
@@ skipping 105 matching lines @@
 base::Time HostContentSettingsMap::GetLastUsageByPattern(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type) {
   UsedContentSettingsProviders();
 
   return GetPrefProvider()->GetLastUsage(
       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]);
+  ContentSetting enabled =
+      is_enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
+  override->SetWebsiteSetting(ContentSettingsPattern::Wildcard(),

[Bernhard Bauer, 2014/09/11 16:49:56]

If you already cast to OverrideProvider, you can add a non-OVERRIDE method to
the class and call that (then you don't need to pass parameters like the
wildcard or the empty resource identifier).

[Daniel Nishi, 2014/09/11 20:58:12]

Done.

+                              ContentSettingsPattern::Wildcard(),
+                              content_type,
+                              std::string(),
+                              new base::FundamentalValue(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);
 }
 
 void HostContentSettingsMap::RemoveObserver(
     content_settings::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void HostContentSettingsMap::SetPrefClockForTesting(
@@ skipping 266 matching lines @@
         return secondary_url.SchemeIs(extensions::kExtensionScheme);
       default:
         return true;
     }
   }
 #endif
   return primary_url.SchemeIs(content::kChromeDevToolsScheme) ||
          primary_url.SchemeIs(content::kChromeUIScheme);
 }
 
-base::Value* HostContentSettingsMap::GetWebsiteSetting(
+scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     content_settings::SettingInfo* info) const {
   DCHECK(SupportsResourceIdentifier(content_type) ||
          resource_identifier.empty());
 
   // Check if the scheme of the requesting url is whitelisted.
   if (ShouldAllowAllContent(primary_url, secondary_url, content_type)) {
     if (info) {
       info->source = content_settings::SETTING_SOURCE_WHITELIST;
       info->primary_pattern = ContentSettingsPattern::Wildcard();
       info->secondary_pattern = ContentSettingsPattern::Wildcard();
     }
-    return new base::FundamentalValue(CONTENT_SETTING_ALLOW);
+    return scoped_ptr<base::Value>(
+        new base::FundamentalValue(CONTENT_SETTING_ALLOW));
   }
 
+  return GetWebsiteSettingInternal(primary_url,
+                                   secondary_url,
+                                   content_type,
+                                   resource_identifier,
+                                   info,
+                                   true);
+}
+
+// static
+HostContentSettingsMap::ProviderType
+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;
+}
+
+content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() {
+  return static_cast<content_settings::PrefProvider*>(
+      content_settings_providers_[PREF_PROVIDER]);
+}
+
+scoped_ptr<base::Value> HostContentSettingsMap::GetWebsiteSettingInternal(
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    ContentSettingsType content_type,
+    const std::string& resource_identifier,
+    content_settings::SettingInfo* info,
+    bool get_override) const {
+  UsedContentSettingsProviders();
   ContentSettingsPattern* primary_pattern = NULL;
   ContentSettingsPattern* secondary_pattern = NULL;
   if (info) {
     primary_pattern = &info->primary_pattern;
     secondary_pattern = &info->secondary_pattern;
   }
 
   // The list of |content_settings_providers_| is ordered according to their
   // precedence.
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
-    base::Value* value = content_settings::GetContentSettingValueAndPatterns(
-        provider->second, primary_url, secondary_url, content_type,
-        resource_identifier, is_off_the_record_,
-        primary_pattern, secondary_pattern);
+    if (!get_override && provider->first == OVERRIDE_PROVIDER)
+      continue;
+
+    scoped_ptr<base::Value> value(
+        content_settings::GetContentSettingValueAndPatterns(provider->second,
+                                                            primary_url,
+                                                            secondary_url,
+                                                            content_type,
+                                                            resource_identifier,
+                                                            is_off_the_record_,
+                                                            primary_pattern,
+                                                            secondary_pattern));
     if (value) {
+      if (provider->first == OVERRIDE_PROVIDER &&
+          content_settings::ValueToContentSetting(value.get()) ==
+              CONTENT_SETTING_ALLOW) {

[Bernhard Bauer, 2014/09/11 16:49:56]

I think you can avoid this by not storing a value in the override provider at
all if it's set to ALLOW.

[Daniel Nishi, 2014/09/11 20:58:12]

Done.

+        continue;
+      }
       if (info)
         info->source = kProviderSourceMap[provider->first];
-      return value;
+      return value.Pass();
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
-  return NULL;
+  return scoped_ptr<base::Value>();
 }
-
-// static
-HostContentSettingsMap::ProviderType
-    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;
-}
-
-content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() {
-  return static_cast<content_settings::PrefProvider*>(
-      content_settings_providers_[PREF_PROVIDER]);
-}