[HBD] Only use Plugin Content Settings for Flash.

chrome/common/plugin_utils.cc

Index: chrome/common/plugin_utils.cc
diff --git a/chrome/common/plugin_utils.cc b/chrome/common/plugin_utils.cc
index 63db43e7e565848f755e81cfa08bd66e5e69d6e3..9c143751282daf3b68c4b7e956ef9b2a32066fc5 100644
--- a/chrome/common/plugin_utils.cc
+++ b/chrome/common/plugin_utils.cc
@@ -5,34 +5,19 @@
 #include "chrome/common/plugin_utils.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/content_constants.h"
 #include "content/public/common/webplugininfo.h"
-#include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
-
-#if !defined(DISABLE_NACL)
-#include "components/nacl/common/nacl_constants.h"
-#endif
 
 bool ShouldUseJavaScriptSettingForPlugin(const content::WebPluginInfo& plugin) {
-  if (plugin.type != content::WebPluginInfo::PLUGIN_TYPE_PEPPER_IN_PROCESS &&
-      plugin.type !=
-          content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) {
+  if (plugin.name == base::ASCIIToUTF16(content::kFlashPluginName))
     return false;
-  }
-
-#if !defined(DISABLE_NACL)
-  // Treat Native Client invocations like JavaScript.
-  if (plugin.name == base::ASCIIToUTF16(nacl::kNaClPluginName))
-    return true;
-#endif
-
-#if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
-  // Treat CDM invocations like JavaScript.
-  if (plugin.name == base::ASCIIToUTF16(kWidevineCdmDisplayName)) {
-    DCHECK_EQ(content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS,
-              plugin.type);
-    return true;
-  }
-#endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS)
 
-  return false;
+  // Since all the UI surfaces for Plugin content settings display "Flash",
+  // treat all other plugins as JavaScript. These include all of:
+  //  - Internally registered plugins such as:
+  //    - NaCl
+  //    - Widevine
+  //    - PDF
+  //  - Custom plugins loaded from the command line
+  return true;
 }