Rename FakeWebTaskRunner to FakeTaskRunner.

WebTaskRunner is gone, and "Web" prefix does not make sense anymore.

Bug: 794845
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I88fc46250b6c178886827967240c142bc67a4b83
Reviewed-on: https://chromium-review.googlesource.com/920126Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537217}

third_party/WebKit/Source/core/editing/FrameCaretTest.cpp

@@ -12,7 +12,7 @@
 #include "core/layout/LayoutTheme.h"
 #include "core/page/FocusController.h"
 #include "platform/LayoutTestSupport.h"
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 
 namespace blink {
 
@@ -38,8 +38,8 @@ class FrameCaretTest : public EditingTestBase {
 
 TEST_F(FrameCaretTest, BlinkAfterTyping) {
   FrameCaret& caret = Selection().FrameCaretForTesting();
-  scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
-      base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
+  scoped_refptr<scheduler::FakeTaskRunner> task_runner =
+      base::MakeRefCounted<scheduler::FakeTaskRunner>();
   task_runner->SetTime(0);
   caret.RecreateCaretBlinkTimerForTesting(task_runner.get());
   const double kInterval = 10;

third_party/WebKit/Source/core/loader/resource/ImageResourceTest.cpp

@@ -48,7 +48,7 @@
 #include "platform/loader/testing/MockFetchContext.h"
 #include "platform/loader/testing/MockResourceClient.h"
 #include "platform/network/http_names.h"
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/ScopedMockedURL.h"
 #include "platform/testing/TestingPlatformSupportWithMockScheduler.h"
@@ -469,8 +469,8 @@ TEST(ImageResourceTest, CancelOnRemoveObserver) {
   ScopedMockedURLLoad scoped_mocked_url_load(test_url, GetTestFilePath());
 
   ResourceFetcher* fetcher = CreateFetcher();
-  scheduler::FakeWebTaskRunner* task_runner =
-      static_cast<scheduler::FakeWebTaskRunner*>(
+  scheduler::FakeTaskRunner* task_runner =
+      static_cast<scheduler::FakeTaskRunner*>(
           fetcher->Context().GetLoadingTaskRunner().get());
   task_runner->SetTime(1);
 
@@ -1927,8 +1927,8 @@ class ImageResourceCounterTest : public ::testing::Test {
     KURL test_url(url);
     ResourceRequest request = ResourceRequest(test_url);
     FetchParameters fetch_params(request);
-    scheduler::FakeWebTaskRunner* task_runner =
-        static_cast<scheduler::FakeWebTaskRunner*>(
+    scheduler::FakeTaskRunner* task_runner =
+        static_cast<scheduler::FakeTaskRunner*>(
             fetcher->Context().GetLoadingTaskRunner().get());
     task_runner->SetTime(1);
 

third_party/WebKit/Source/platform/WebTaskRunnerTest.cpp

@@ -4,7 +4,7 @@
 
 #include "platform/WebTaskRunner.h"
 
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace blink {
@@ -38,8 +38,8 @@ class CancellationTestHelper {
 }  // namespace
 
 TEST(WebTaskRunnerTest, PostCancellableTaskTest) {
-  scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
-      base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
+  scoped_refptr<scheduler::FakeTaskRunner> task_runner =
+      base::MakeRefCounted<scheduler::FakeTaskRunner>();
 
   // Run without cancellation.
   int count = 0;
@@ -121,8 +121,8 @@ TEST(WebTaskRunnerTest, PostCancellableTaskTest) {
 }
 
 TEST(WebTaskRunnerTest, CancellationCheckerTest) {
-  scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
-      base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
+  scoped_refptr<scheduler::FakeTaskRunner> task_runner =
+      base::MakeRefCounted<scheduler::FakeTaskRunner>();
 
   int count = 0;
   TaskHandle handle = PostCancellableTask(

third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp

@@ -36,7 +36,7 @@
 #include "platform/graphics/DeferredImageDecoder.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/test/MockImageDecoder.h"
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 #include "platform/testing/HistogramTester.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/TestingPlatformSupportWithMockScheduler.h"
@@ -468,8 +468,8 @@ TEST_F(BitmapImageTestWithMockDecoder, DontAdvanceToIncompleteFrame) {
   // still won't advance it.
   image_->SetData(SharedBuffer::Create("data", sizeof("data")), true);
 
-  scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
-      base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
+  scoped_refptr<scheduler::FakeTaskRunner> task_runner =
+      base::MakeRefCounted<scheduler::FakeTaskRunner>();
   image_->SetTaskRunnerForTesting(task_runner);
   task_runner->SetTime(10);
 
@@ -503,8 +503,8 @@ TEST_F(BitmapImageTestWithMockDecoder, FrameSkipTracking) {
   // received.
   image_->SetData(SharedBuffer::Create("data", sizeof("data")), false);
 
-  scoped_refptr<scheduler::FakeWebTaskRunner> task_runner =
-      base::MakeRefCounted<scheduler::FakeWebTaskRunner>();
+  scoped_refptr<scheduler::FakeTaskRunner> task_runner =
+      base::MakeRefCounted<scheduler::FakeTaskRunner>();
   image_->SetTaskRunnerForTesting(task_runner);
   task_runner->SetTime(10);
 

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcherTest.cpp

@@ -49,7 +49,6 @@
 #include "platform/loader/testing/MockFetchContext.h"
 #include "platform/loader/testing/MockResource.h"
 #include "platform/loader/testing/MockResourceClient.h"
-#include "platform/scheduler/test/fake_web_task_runner.h"
 #include "platform/testing/TestingPlatformSupport.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "platform/testing/UnitTestHelpers.h"

third_party/WebKit/Source/platform/loader/testing/MockFetchContext.h

@@ -10,8 +10,8 @@
 #include "platform/loader/fetch/FetchContext.h"
 #include "platform/loader/fetch/FetchParameters.h"
 #include "platform/loader/fetch/ResourceTimingInfo.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 #include "platform/scheduler/test/fake_web_frame_scheduler.h"
-#include "platform/scheduler/test/fake_web_task_runner.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderFactory.h"
@@ -125,7 +125,7 @@ class MockFetchContext : public FetchContext {
 
   MockFetchContext(LoadPolicy load_policy)
       : load_policy_(load_policy),
-        runner_(base::MakeRefCounted<scheduler::FakeWebTaskRunner>()),
+        runner_(base::MakeRefCounted<scheduler::FakeTaskRunner>()),
         security_origin_(SecurityOrigin::CreateUnique()),
         frame_scheduler_(new MockFrameScheduler(runner_)),
         complete_(false),

third_party/WebKit/Source/platform/network/NetworkStateNotifierTest.cpp

@@ -30,7 +30,7 @@
 
 #include "platform/network/NetworkStateNotifier.h"
 
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 #include "platform/testing/UnitTestHelpers.h"
 #include "platform/wtf/Functional.h"
 #include "platform/wtf/Optional.h"
@@ -43,7 +43,7 @@
 
 namespace blink {
 
-using scheduler::FakeWebTaskRunner;
+using scheduler::FakeTaskRunner;
 
 namespace {
 const double kNoneMaxBandwidthMbps = 0.0;
@@ -163,8 +163,8 @@ class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
 class NetworkStateNotifierTest : public ::testing::Test {
  public:
   NetworkStateNotifierTest()
-      : task_runner_(base::MakeRefCounted<FakeWebTaskRunner>()),
-        task_runner2_(base::MakeRefCounted<FakeWebTaskRunner>()) {
+      : task_runner_(base::MakeRefCounted<FakeTaskRunner>()),
+        task_runner2_(base::MakeRefCounted<FakeTaskRunner>()) {
     // Initialize connection, so that future calls to setWebConnection issue
     // notifications.
     notifier_.SetWebConnection(kWebConnectionTypeUnknown, 0.0);
@@ -241,8 +241,8 @@ class NetworkStateNotifierTest : public ::testing::Test {
            observer.ObservedSaveData() == save_data;
   }
 
-  scoped_refptr<FakeWebTaskRunner> task_runner_;
-  scoped_refptr<FakeWebTaskRunner> task_runner2_;
+  scoped_refptr<FakeTaskRunner> task_runner_;
+  scoped_refptr<FakeTaskRunner> task_runner2_;
   NetworkStateNotifier notifier_;
 };
 

third_party/WebKit/Source/platform/scheduler/BUILD.gn

@@ -155,9 +155,9 @@ jumbo_source_set("test_support") {
     "test/create_task_queue_manager_for_test.cc",
     "test/create_task_queue_manager_for_test.h",
     "test/fake_renderer_scheduler.cc",
+    "test/fake_task_runner.cc",
+    "test/fake_task_runner.h",
     "test/fake_web_frame_scheduler.h",
-    "test/fake_web_task_runner.cc",
-    "test/fake_web_task_runner.h",
     "test/fake_web_view_scheduler.h",
     "test/lazy_thread_controller_for_test.cc",
     "test/lazy_thread_controller_for_test.h",

third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.cc → third_party/WebKit/Source/platform/scheduler/test/fake_task_runner.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "platform/scheduler/test/fake_web_task_runner.h"
+#include "platform/scheduler/test/fake_task_runner.h"
 
 #include <algorithm>
 #include <deque>
@@ -17,7 +17,7 @@
 namespace blink {
 namespace scheduler {
 
-class FakeWebTaskRunner::Data : public WTF::ThreadSafeRefCounted<Data> {
+class FakeTaskRunner::Data : public WTF::ThreadSafeRefCounted<Data> {
  public:
   Data() = default;
 
@@ -25,7 +25,7 @@ class FakeWebTaskRunner::Data : public WTF::ThreadSafeRefCounted<Data> {
     task_queue_.emplace_back(std::move(task), time_ + delay);
   }
 
-  using PendingTask = FakeWebTaskRunner::PendingTask;
+  using PendingTask = FakeTaskRunner::PendingTask;
   std::deque<PendingTask>::iterator FindRunnableTask() {
     // TODO(tkent): This should return an item which has the minimum |second|.
     return std::find_if(
@@ -44,22 +44,22 @@ class FakeWebTaskRunner::Data : public WTF::ThreadSafeRefCounted<Data> {
   DISALLOW_COPY_AND_ASSIGN(Data);
 };
 
-FakeWebTaskRunner::FakeWebTaskRunner() : data_(base::AdoptRef(new Data)) {}
+FakeTaskRunner::FakeTaskRunner() : data_(base::AdoptRef(new Data)) {}
 
-FakeWebTaskRunner::FakeWebTaskRunner(scoped_refptr<Data> data)
+FakeTaskRunner::FakeTaskRunner(scoped_refptr<Data> data)
     : data_(std::move(data)) {}
 
-FakeWebTaskRunner::~FakeWebTaskRunner() = default;
+FakeTaskRunner::~FakeTaskRunner() = default;
 
-void FakeWebTaskRunner::SetTime(base::TimeTicks new_time) {
+void FakeTaskRunner::SetTime(base::TimeTicks new_time) {
   data_->time_ = new_time;
 }
 
-bool FakeWebTaskRunner::RunsTasksInCurrentSequence() const {
+bool FakeTaskRunner::RunsTasksInCurrentSequence() const {
   return true;
 }
 
-void FakeWebTaskRunner::RunUntilIdle() {
+void FakeTaskRunner::RunUntilIdle() {
   while (!data_->task_queue_.empty()) {
     // Move the task to run into a local variable in case it touches the
     // task queue by posting a new task.
@@ -69,7 +69,7 @@ void FakeWebTaskRunner::RunUntilIdle() {
   }
 }
 
-void FakeWebTaskRunner::AdvanceTimeAndRun(base::TimeDelta delta) {
+void FakeTaskRunner::AdvanceTimeAndRun(base::TimeDelta delta) {
   data_->time_ += delta;
   for (auto it = data_->FindRunnableTask(); it != data_->task_queue_.end();
        it = data_->FindRunnableTask()) {
@@ -80,21 +80,20 @@ void FakeWebTaskRunner::AdvanceTimeAndRun(base::TimeDelta delta) {
 }
 
 std::deque<std::pair<base::OnceClosure, base::TimeTicks>>
-FakeWebTaskRunner::TakePendingTasksForTesting() {
+FakeTaskRunner::TakePendingTasksForTesting() {
   return std::move(data_->task_queue_);
 }
 
-bool FakeWebTaskRunner::PostDelayedTask(const base::Location& location,
-                                        base::OnceClosure task,
-                                        base::TimeDelta delay) {
+bool FakeTaskRunner::PostDelayedTask(const base::Location& location,
+                                     base::OnceClosure task,
+                                     base::TimeDelta delay) {
   data_->PostDelayedTask(std::move(task), delay);
   return true;
 }
 
-bool FakeWebTaskRunner::PostNonNestableDelayedTask(
-    const base::Location& location,
-    base::OnceClosure task,
-    base::TimeDelta delay) {
+bool FakeTaskRunner::PostNonNestableDelayedTask(const base::Location& location,
+                                                base::OnceClosure task,
+                                                base::TimeDelta delay) {
   data_->PostDelayedTask(std::move(task), delay);
   return true;
 }

third_party/WebKit/Source/platform/scheduler/test/fake_web_task_runner.h → third_party/WebKit/Source/platform/scheduler/test/fake_task_runner.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_WEB_TASK_RUNNER_H_
-#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_WEB_TASK_RUNNER_H_
+#ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_TASK_RUNNER_H_
+#define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_TASK_RUNNER_H_
 
 #include <deque>
 
@@ -16,10 +16,10 @@
 namespace blink {
 namespace scheduler {
 
-// A dummy WebTaskRunner for tests.
-class FakeWebTaskRunner : public base::SingleThreadTaskRunner {
+// A dummy task runner for tests.
+class FakeTaskRunner : public base::SingleThreadTaskRunner {
  public:
-  FakeWebTaskRunner();
+  FakeTaskRunner();
 
   void SetTime(base::TimeTicks new_time);
   void SetTime(double new_time) {
@@ -47,18 +47,18 @@ class FakeWebTaskRunner : public base::SingleThreadTaskRunner {
                                   base::TimeDelta delay) override;
 
  private:
-  ~FakeWebTaskRunner() override;
+  ~FakeTaskRunner() override;
 
   class Data;
   class BaseTaskRunner;
   scoped_refptr<Data> data_;
 
-  explicit FakeWebTaskRunner(scoped_refptr<Data> data);
+  explicit FakeTaskRunner(scoped_refptr<Data> data);
 
-  DISALLOW_COPY_AND_ASSIGN(FakeWebTaskRunner);
+  DISALLOW_COPY_AND_ASSIGN(FakeTaskRunner);
 };
 
 }  // namespace scheduler
 }  // namespace blink
 
-#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_WEB_TASK_RUNNER_H_
+#endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_TEST_FAKE_TASK_RUNNER_H_