Enable Pepper threading on all channels.

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 8e08d5d72604f44364c319c82b6bc4408ab98a8e..577498bff25ae8b4c31a5f3427180207335a6646 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -313,15 +313,9 @@ void AddPepperFlashFromCommandLine(
 }
 
 bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
+#if defined(FLAPPER_AVAILABLE)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kDisablePepperThreading) &&
-      !command_line->HasSwitch(switches::kEnablePepperThreading)) {
-    chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-    if (channel == chrome::VersionInfo::CHANNEL_CANARY)
-      command_line->AppendSwitch(switches::kEnablePepperThreading);
-  }
 
-#if defined(FLAPPER_AVAILABLE)
   // Ignore bundled Pepper Flash if there is Pepper Flash specified from the
   // command-line.
   if (command_line->HasSwitch(switches::kPpapiFlashPath))