Revert of scheduler: Always create a real scheduler in unit tests

content/test/test_blink_web_unit_test_support.cc

 // Copyright 2013 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/test/test_blink_web_unit_test_support.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
-#include "components/scheduler/renderer/renderer_scheduler_impl.h"
+#include "components/scheduler/renderer/renderer_scheduler.h"
 #include "components/scheduler/renderer/webthread_impl_for_renderer_scheduler.h"
-#include "components/scheduler/test/lazy_scheduler_message_loop_delegate_for_tests.h"
 #include "content/test/mock_webclipboard_impl.h"
 #include "content/test/web_gesture_curve_mock.h"
 #include "content/test/web_layer_tree_view_impl_for_testing.h"
 #include "content/test/weburl_loader_mock_factory.h"
 #include "media/base/media.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "storage/browser/database/vfs_backend.h"
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebFileSystem.h"
+#include "third_party/WebKit/public/platform/WebScheduler.h"
 #include "third_party/WebKit/public/platform/WebStorageArea.h"
 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDatabase.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
 #include "v8/include/v8.h"
@@ skipping 32 matching lines @@
   }
 
  protected:
   ~DummyTaskRunner() override {}
 
   base::PlatformThreadId thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DummyTaskRunner);
 };
 
+class DummyWebThread : public blink::WebThread {
+ public:
+  DummyWebThread()
+      : thread_id_(base::PlatformThread::CurrentId()),
+        m_dummyScheduler(new blink::WebScheduler()) {}
+
+  virtual void postTask(const blink::WebTraceLocation&, Task*) { NOTREACHED(); }
+
+  virtual void postDelayedTask(const blink::WebTraceLocation&,
+                               Task*,
+                               long long delayMs) {
+    NOTREACHED();
+  }
+
+  virtual bool isCurrentThread() const {
+    return thread_id_ == base::PlatformThread::CurrentId();
+  }
+
+  virtual blink::WebScheduler* scheduler() const {
+    return m_dummyScheduler.get();
+  }
+
+ private:
+  base::PlatformThreadId thread_id_;
+  scoped_ptr<blink::WebScheduler> m_dummyScheduler;
+
+  DISALLOW_COPY_AND_ASSIGN(DummyWebThread);
+};
+
 }  // namespace
 
 namespace content {
 
 TestBlinkWebUnitTestSupport::TestBlinkWebUnitTestSupport() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #endif
 
   url_loader_factory_.reset(new WebURLLoaderMockFactory());
   mock_clipboard_.reset(new MockWebClipboardImpl());
 
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
   gin::V8Initializer::LoadV8Snapshot();
 #endif
 
   scoped_refptr<base::SingleThreadTaskRunner> dummy_task_runner;
   scoped_ptr<base::ThreadTaskRunnerHandle> dummy_task_runner_handle;
-  if (!base::MessageLoopProxy::current()) {
+  if (base::MessageLoopProxy::current()) {
+    renderer_scheduler_ = scheduler::RendererScheduler::Create();
+    web_thread_.reset(new scheduler::WebThreadImplForRendererScheduler(
+        renderer_scheduler_.get()));
+  } else {
     // Dummy task runner is initialized here because the blink::initialize
     // creates IsolateHolder which needs the current task runner handle. There
     // should be no task posted to this task runner. The message loop is not
     // created before this initialization because some tests need specific kinds
     // of message loops, and their types are not known upfront. Some tests also
     // create their own thread bundles or message loops, and doing the same in
     // TestBlinkWebUnitTestSupport would introduce a conflict.
     dummy_task_runner = make_scoped_refptr(new DummyTaskRunner());
     dummy_task_runner_handle.reset(
         new base::ThreadTaskRunnerHandle(dummy_task_runner));
+    web_thread_.reset(new DummyWebThread());
   }
-  renderer_scheduler_ = make_scoped_ptr(new scheduler::RendererSchedulerImpl(
-      scheduler::LazySchedulerMessageLoopDelegateForTests::Create()));
-  web_thread_.reset(new scheduler::WebThreadImplForRendererScheduler(
-      renderer_scheduler_.get()));
 
   blink::initialize(this);
   blink::setLayoutTestMode(true);
   blink::WebSecurityPolicy::registerURLSchemeAsLocal(
       blink::WebString::fromUTF8("test-shell-resource"));
   blink::WebSecurityPolicy::registerURLSchemeAsNoAccess(
       blink::WebString::fromUTF8("test-shell-resource"));
   blink::WebSecurityPolicy::registerURLSchemeAsDisplayIsolated(
       blink::WebString::fromUTF8("test-shell-resource"));
   blink::WebSecurityPolicy::registerURLSchemeAsEmptyDocument(
@@ skipping 250 matching lines @@
   DCHECK(base::MessageLoop::current());
   DCHECK(!base::MessageLoop::current()->is_running());
   base::MessageLoop::current()->Run();
 }
 
 void TestBlinkWebUnitTestSupport::exitRunLoop() {
   base::MessageLoop::current()->Quit();
 }
 
 }  // namespace content