Remove usage of FakeRendererScheduler that's not necessary.

In some tests, FakeRendererScheduler is used to obtain the IPC task
runner. However, FakeRendererScheduler::IPCTaskRunner() just returns
nullptr, and there's no real point in using FakeRendererScheduler in
those tests.

This CL removes those unnecessary FakeRendererSchedulers, and passes
nullptr to the arguments where an IPC task runner is expected.

This CL is part of the refactoring of WebThreadScheduler.

Bug: 826203
Change-Id: Ie6800829b3f30cf19a1c2212e58e4cab505df80b
Reviewed-on: https://chromium-review.googlesource.com/c/1319224
Commit-Queue: Yuta Kitamura <yutak@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Alexander Timin <altimin@chromium.org>
Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606367}

third_party/blink/renderer/modules/storage/DEPS

+specific_include_rules = {
+  "storage_controller_test\.cc": [
+    "+base/run_loop.h",
+  ],
+}

third_party/blink/renderer/modules/storage/cached_storage_area_test.cc

@@ -5,7 +5,7 @@
 #include "third_party/blink/renderer/modules/storage/cached_storage_area.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/platform/scheduler/test/fake_renderer_scheduler.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/renderer/modules/storage/testing/fake_area_source.h"
 #include "third_party/blink/renderer/modules/storage/testing/mock_storage_area.h"
 #include "third_party/blink/renderer/platform/weborigin/kurl.h"
@@ -32,11 +32,11 @@ class CachedStorageAreaTest : public testing::Test,
     if (IsSessionStorage()) {
       cached_area_ = CachedStorageArea::CreateForSessionStorage(
           kOrigin, mock_storage_area_.GetAssociatedInterfacePtr(),
-          renderer_scheduler_->IPCTaskRunner(), this);
+          scheduler::GetSingleThreadTaskRunnerForTesting(), this);
     } else {
       cached_area_ = CachedStorageArea::CreateForLocalStorage(
           kOrigin, mock_storage_area_.GetInterfacePtr(),
-          renderer_scheduler_->IPCTaskRunner(), this);
+          scheduler::GetSingleThreadTaskRunnerForTesting(), this);
     }
     source_area_ = new FakeAreaSource(kPageUrl);
     source_area_id_ = cached_area_->RegisterSource(source_area_);
@@ -98,8 +98,6 @@ class CachedStorageAreaTest : public testing::Test,
   }
 
  protected:
-  std::unique_ptr<scheduler::WebThreadScheduler> renderer_scheduler_ =
-      std::make_unique<scheduler::FakeRendererScheduler>();
   MockStorageArea mock_storage_area_;
   Persistent<FakeAreaSource> source_area_;
   Persistent<FakeAreaSource> source_area2_;

third_party/blink/renderer/modules/storage/storage_controller_test.cc

@@ -4,12 +4,13 @@
 
 #include "third_party/blink/renderer/modules/storage/storage_controller.h"
 
+#include "base/run_loop.h"
 #include "base/task/post_task.h"
 #include "base/test/scoped_feature_list.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/platform/scheduler/test/fake_renderer_scheduler.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/renderer/modules/storage/storage_namespace.h"
 #include "third_party/blink/renderer/modules/storage/testing/fake_area_source.h"
 #include "third_party/blink/renderer/modules/storage/testing/mock_storage_area.h"
@@ -56,8 +57,6 @@ TEST(StorageControllerTest, CacheLimit) {
   const KURL kPageUrl("http://dom_storage/page");
   Persistent<FakeAreaSource> source_area = new FakeAreaSource(kPageUrl);
 
-  blink::scheduler::FakeRendererScheduler renderer_scheduler;
-
   mojom::blink::StoragePartitionServicePtr storage_partition_service_ptr;
   PostCrossThreadTask(
       *base::CreateSequencedTaskRunnerWithTraits({}), FROM_HERE,
@@ -69,7 +68,7 @@ TEST(StorageControllerTest, CacheLimit) {
           },
           WTF::Passed(MakeRequest(&storage_partition_service_ptr))));
 
-  StorageController controller(renderer_scheduler.IPCTaskRunner(),
+  StorageController controller(scheduler::GetSingleThreadTaskRunnerForTesting(),
                                std::move(storage_partition_service_ptr),
                                kTestCacheLimit);
 
@@ -112,7 +111,6 @@ TEST(StorageControllerTest, CacheLimitSessionStorage) {
 
   Persistent<FakeAreaSource> source_area = new FakeAreaSource(kPageUrl);
 
-  blink::scheduler::FakeRendererScheduler renderer_scheduler;
   auto task_runner = base::CreateSequencedTaskRunnerWithTraits({});
 
   auto mock_storage_partition_service =
@@ -131,9 +129,8 @@ TEST(StorageControllerTest, CacheLimitSessionStorage) {
           },
           WTF::Passed(std::move(mock_storage_partition_service)),
           WTF::Passed(MakeRequest(&storage_partition_service_ptr))));
-  StorageController controller(renderer_scheduler.IPCTaskRunner(),
-                               std::move(storage_partition_service_ptr),
-                               kTestCacheLimit);
+  StorageController controller(
+      nullptr, std::move(storage_partition_service_ptr), kTestCacheLimit);
 
   StorageNamespace* ns1 = controller.CreateSessionStorageNamespace(kNamespace1);
   StorageNamespace* ns2 = controller.CreateSessionStorageNamespace(kNamespace2);

third_party/blink/renderer/modules/storage/storage_namespace_test.cc

@@ -10,7 +10,7 @@
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/platform/scheduler/test/fake_renderer_scheduler.h"
+#include "third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h"
 #include "third_party/blink/renderer/modules/storage/testing/fake_area_source.h"
 #include "third_party/blink/renderer/platform/cross_thread_functional.h"
 #include "third_party/blink/renderer/platform/uuid.h"
@@ -55,8 +55,6 @@ TEST_F(StorageNamespaceTest, BasicStorageAreas) {
   const KURL kPageUrl("http://dom_storage/page");
   Persistent<FakeAreaSource> source_area = new FakeAreaSource(kPageUrl);
 
-  blink::scheduler::FakeRendererScheduler renderer_scheduler;
-
   mojom::blink::StoragePartitionServicePtr storage_partition_service_ptr;
   PostCrossThreadTask(
       *base::CreateSequencedTaskRunnerWithTraits({}), FROM_HERE,
@@ -68,7 +66,7 @@ TEST_F(StorageNamespaceTest, BasicStorageAreas) {
           },
           WTF::Passed(MakeRequest(&storage_partition_service_ptr))));
 
-  StorageController controller(renderer_scheduler.IPCTaskRunner(),
+  StorageController controller(scheduler::GetSingleThreadTaskRunnerForTesting(),
                                std::move(storage_partition_service_ptr),
                                kTestCacheLimit);
   StorageNamespace* localStorage = new StorageNamespace(&controller);