[HBD] Only use Plugin Content Settings for Flash.

chrome/common/plugin_utils.cc

 // Copyright 2016 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/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 !=
+  if (plugin.name == base::ASCIIToUTF16(content::kFlashPluginName) &&
+      plugin.type ==
           content::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS) {

[xhwang, 2016/09/26 23:44:51]

how about in-process pepper, or it doesn't exist? if so, can we have a comment
just in case people may ask again?

actually, why do care about whether it's in-process or out-of-process flash?

[raymes, 2016/09/27 01:31:18]

There is no in-process flash. We want to make sure that it's actually the Flash
pepper plugin (as opposed to some other random plugin loaded with the same name
as flash).

[tommycli, 2016/09/27 18:51:07]

Actually since it seems that PLUGINS is a stricter content setting than
JAVASCRIPT, we would want to treat any plugin that MIGHT BE Flash, as Flash.
Moreover, every other place in the code that tests for Flash uses only the name,
rather than the name and type.

Therefore I removed the OUT_OF_PROCESS stipulation. Thoughts?

     return false;
   }
 

[xhwang, 2016/09/26 23:44:51]

Can we just return true here and remove all the code below?

[tommycli, 2016/09/27 18:51:07]

Done.

 #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 (loaded only via command-line), as JavaScript.

[xhwang, 2016/09/26 23:44:51]

Do you mean "all other plugins that are loaded via command-line"? How about
other plugins registered internally? It'd be great to make this comment
clearer...

[tommycli, 2016/09/27 18:51:07]

Done.

+  return true;
 }