[HBD] Map ASK to DETECT_IMPORTANT_CONTENT when PreferHtmlOverPlugins is enabled

chrome/browser/plugins/plugins_field_trial.cc

Index: chrome/browser/plugins/plugins_field_trial.cc
diff --git a/chrome/browser/plugins/plugins_field_trial.cc b/chrome/browser/plugins/plugins_field_trial.cc
new file mode 100644
index 0000000000000000000000000000000000000000..03e7d2f508c56b3d269df3a2963c46b5925f2885
--- /dev/null
+++ b/chrome/browser/plugins/plugins_field_trial.cc
@@ -0,0 +1,26 @@
+// Copyright 2015 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/plugins/plugins_field_trial.h"
+
+#include "base/feature_list.h"
+#include "chrome/common/chrome_features.h"
+
+// static
+ContentSetting PluginsFieldTrial::EffectiveContentSetting(
+    ContentSettingsType type,
+    ContentSetting setting) {
+  if (type != CONTENT_SETTINGS_TYPE_PLUGINS)

[Lei Zhang, 2016/08/22 17:57:54]

if (type != CONTENT_SETTINGS_TYPE_PLUGINS ||
    setting != ContentSetting::CONTENT_SETTING_ASK) {
  return settings;
}

return base::FeatureList::IsEnabled(...);

[trizzofo, 2016/08/22 18:09:36]

Done.

+    return setting;
+
+  // For Plugins, ASK is obsolete. Show as BLOCK or, if PreferHtmlOverPlugins
+  // feature is enabled, as DETECT_IMPORTANT_CONTENT to reflect actual behavior.
+  if (setting == ContentSetting::CONTENT_SETTING_ASK) {
+      return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)
+               ? ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT
+               : ContentSetting::CONTENT_SETTING_BLOCK;
+  }
+
+  return setting;
+}