Enable Pepper threading on canary.

content/ppapi_plugin/ppapi_thread.cc

 // Copyright (c) 2012 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 "content/ppapi_plugin/ppapi_thread.h"
 
 #include <limits>
 
 #include "base/command_line.h"
 #include "base/process_util.h"
@@ skipping 43 matching lines @@
 PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker)
     : is_broker_(is_broker),
       connect_instance_func_(NULL),
       local_pp_module_(
           base::RandInt(0, std::numeric_limits<PP_Module>::max())),
       next_plugin_dispatcher_id_(1) {
   ppapi::proxy::PluginGlobals* globals = ppapi::proxy::PluginGlobals::Get();
   globals->set_plugin_proxy_delegate(this);
   globals->set_command_line(
       command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs));
-  globals->set_enable_threading(
-      command_line.HasSwitch(switches::kEnablePepperThreading));
+  if (command_line.HasSwitch(switches::kDisablePepperThreading)) {
+    globals->set_enable_threading(false);
+  } else if (command_line.HasSwitch(switches::kEnablePepperThreading)) {
+    globals->set_enable_threading(true);
+  } else {
+    globals->set_enable_threading(false);
+  }
 
   webkit_platform_support_.reset(new PpapiWebKitPlatformSupportImpl);
   WebKit::initialize(webkit_platform_support_.get());
 }
 
 PpapiThread::~PpapiThread() {
   ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL);
   if (plugin_entry_points_.shutdown_module)
     plugin_entry_points_.shutdown_module();
   WebKit::shutdown();
@@ skipping 344 matching lines @@
 
   // plugin() is NULL when in-process.  Which is fine, because this is
   // just a hook for setting the process name.
   if (GetContentClient()->plugin()) {
     GetContentClient()->plugin()->PluginProcessStarted(
         path.BaseName().RemoveExtension().LossyDisplayName());
   }
 }
 
 }  // namespace content