Enable Pepper threading on all channels.

Enable Pepper threading on all channels.

Revision 170633 added --disable-pepper-threading and enabled threading
for canary channel only.  Enable on all channels, remove
--enable-pepper-threading, but keep the --disable flag for now for
debugging purposes.

BUG=161286
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=175263

[Scott Hess - ex-Googler, 2012-12-26 19:45:28]

Previous CL in series is at:
  https://chromiumcodereview.appspot.com/11419260

Note that http://crbug.com/166951 is a case where the deadlock-detector is
triggering on Canary on ChromeOS for YouTube.  So I'm not sure if we can land
this or not.

[brettw, 2013-01-02 22:14:48]

lgtm

[commit-bot: I haz the power, 2013-01-04 00:53:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shess@chromium.org/11659032/1

[commit-bot: I haz the power, 2013-01-04 00:53:35]

Failed to apply patch for chrome/common/chrome_content_client.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/common/chrome_content_client.cc
  Hunk #1 FAILED at 314.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/common/chrome_content_client.cc.rej

Patch:       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
9ad32fd687b3a509688217d5798503c709e046e2..c148fa5db159989ff771c4fb582eabcebe4cd194
100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -314,15 +314,9 @@ void AddPepperFlashFromCommandLine(
 
 bool GetBundledPepperFlash(content::PepperPluginInfo* plugin,
                            bool* override_npapi_flash) {
+#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))

[commit-bot: I haz the power, 2013-01-04 22:15:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shess@chromium.org/11659032/6001

[commit-bot: I haz the power, 2013-01-04 22:36:03]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_aura.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[Scott Hess - ex-Googler, 2013-01-04 23:28:20]

On 2013/01/04 22:36:03, I haz the power (commit-bot) wrote:
> Sorry for I got bad news for ya.
> Compile failed with a clobber build on linux_aura.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_aura...
> Your code is likely broken or HEAD is junk. Please ensure your
> code is not broken then alert the build sheriffs.
> Look at the try server FAQ for more details.

stale ref to enable switch.

[commit-bot: I haz the power, 2013-01-04 23:28:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shess@chromium.org/11659032/10003

[commit-bot: I haz the power, 2013-01-05 02:13:38]

Change committed as 175263