Disallow user overrides to enterprise policy for plugins.

chrome/browser/plugins/plugin_info_message_filter.cc

Index: chrome/browser/plugins/plugin_info_message_filter.cc
diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc
index 2c6a5a6a2c68d09f69cd41fa491b0d694fae9a47..a207b507222edbc1122b6f036d2f28ed4ff752ab 100644
--- a/chrome/browser/plugins/plugin_info_message_filter.cc
+++ b/chrome/browser/plugins/plugin_info_message_filter.cc
@@ -489,15 +489,10 @@ void PluginInfoMessageFilter::Context::GetPluginContentSetting(
         host_content_settings_map_->GetWebsiteSetting(
             policy_url, plugin_url, CONTENT_SETTINGS_TYPE_PLUGINS,
             std::string(), &general_info);
-
     // If there is a plugin-specific setting, we use it, unless the general
     // setting was set by policy, in which case it takes precedence.
-    // TODO(tommycli): Remove once we deprecate the plugin ASK policy.
-    bool legacy_ask_user = content_settings::ValueToContentSetting(
-                               general_setting.get()) == CONTENT_SETTING_ASK;
     bool use_policy =
-        general_info.source == content_settings::SETTING_SOURCE_POLICY &&
-        !legacy_ask_user;
+        general_info.source == content_settings::SETTING_SOURCE_POLICY;

[tommycli, 2016/07/18 22:33:16]

nit: since we only use use_policy once, just inline into next line

[Will Harris, 2016/07/19 02:13:49]

Done.

     uses_plugin_specific_setting = specific_setting && !use_policy;
     if (uses_plugin_specific_setting) {
       value = std::move(specific_setting);