[HBD] Don't advertise flash if PreferHtmlOverPlugins feature is enabled

chrome/browser/plugins/chrome_plugin_service_filter.cc

Index: chrome/browser/plugins/chrome_plugin_service_filter.cc
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc
index e815629fc14351c8d7de056473ca9d53db05a109..f6d648e8669c25f7a6411bb35dc1169858f312f3 100644
--- a/chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/plugins/plugin_metadata.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/content_settings/content/common/content_settings_messages.h"
@@ -30,6 +31,7 @@
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/content_constants.h"
 #include "grit/components_strings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -104,6 +106,12 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
     }
   }
 
+  // Check whether PreferHtmlOverPlugins feature is enabled.
+  if (plugin->name == base::ASCIIToUTF16(content::kFlashPluginName) &&
+      base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)) {
+    return false;
+  }
+
   // Check whether the plugin is disabled.
   ResourceContextMap::iterator prefs_it =
       resource_context_map_.find(context);
@@ -224,4 +232,3 @@ ChromePluginServiceFilter::ProcessDetails::ProcessDetails(
 
 ChromePluginServiceFilter::ProcessDetails::~ProcessDetails() {
 }
-