Enable Blink Scheduler (but not for WebView or ChromeOS)

content/renderer/scheduler/renderer_scheduler.cc

 // Copyright 2014 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/renderer/scheduler/renderer_scheduler.h"
 
+#include "base/command_line.h"
+#include "base/message_loop/message_loop_proxy.h"
+#include "content/public/common/content_switches.h"
 #include "content/renderer/scheduler/null_renderer_scheduler.h"
+#include "content/renderer/scheduler/renderer_scheduler_impl.h"
 
 namespace content {
 
 RendererScheduler::RendererScheduler() {
 }
 
 RendererScheduler::~RendererScheduler() {
 }
 
 // static
 scoped_ptr<RendererScheduler> RendererScheduler::Create() {
-  // TODO(rmcilroy): Use the RendererSchedulerImpl when the scheduler is enabled
+  // FIXME: Some chromeos browser tests timeout with the scheduler enabled.
+  // See crbug.com/444574
+#ifdef OS_CHROMEOS
   return make_scoped_ptr(new NullRendererScheduler());
+#endif
+
+  CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kDisableBlinkScheduler)) {
+    return make_scoped_ptr(new NullRendererScheduler());
+  } else {
+    return make_scoped_ptr(
+        new RendererSchedulerImpl(base::MessageLoopProxy::current()));
+  }
 }
 
 }  // namespace content