Do not register any flash if flash is disabled

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 4255c1b6664da68748e9ba36aba82aa990b25221..eeaeabe37f534d72573dd31d48519f8d5529e63b 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -490,6 +490,11 @@ void ChromeContentClient::AddPepperPlugins(
 #if BUILDFLAG(ENABLE_PLUGINS)
   ComputeBuiltInPlugins(plugins);
 
+  // If flash is disabled, do not try to add any flash plugin.
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kDisableBundledPpapiFlash))
+    return;
+
   std::vector<std::unique_ptr<content::PepperPluginInfo>> flash_versions;
 
 // Get component updated flash for desktop Linux and Chrome OS.