commit 41b3811f190e351cd29a39589eb0aed8fdaedd8e
author fdoray <fdoray@chromium.org> Mon May 15 18:24:04 2017
committer Commit bot <commit-bot@chromium.org> Mon May 15 18:24:04 2017
tree 12193699530a6ad5487939aa39ffd21aab3a6edc
parent a469806c5653b6fae16b055d017f0c55cfaf9a59

Remove TestWebThreadBundle::REAL_TASK_SCHEDULER.

This option was also removed from content::TestBrowserThreadBundle.
https://codereview.chromium.org/2767923002

BUG=708584

Review-Url: https://codereview.chromium.org/2887463002
Cr-Commit-Position: refs/heads/master@{#471835}

ios/web/public/test/test_web_thread_bundle.h

diff --git a/ios/web/public/test/test_web_thread_bundle.h b/ios/web/public/test/test_web_thread_bundle.h
index dc3497c..49eb03f 100644
--- a/ios/web/public/test/test_web_thread_bundle.h
+++ b/ios/web/public/test/test_web_thread_bundle.h
@@ -12,16 +12,16 @@
 // first member variable in test classes, so it is destroyed last, and the test
 // threads always exist from the perspective of other classes.
 //
-// By default, all of the created TestWebThreads and the task scheduler will
-// be backed by a single shared MessageLoop. If a test truly needs separate
-// threads, it can do so by passing the appropriate combination of option values
-// during the TestWebThreadBundle construction.
+// By default, all of the created TestWebThreads will be backed by a single
+// shared MessageLoop. If a test truly needs separate threads, it can do so by
+// passing the appropriate combination of option values during the
+// TestWebThreadBundle construction.
 //
-// To synchronously run tasks posted to task scheduler or to TestWebThreads
-// that use the shared MessageLoop, call RunLoop::Run/RunUntilIdle() on the
-// thread where the TestWebThreadBundle lives. The destructor of
-// TestWebThreadBundle runs remaining TestWebThreads tasks, remaining
-// blocking pool tasks, and remaining BLOCK_SHUTDOWN task scheduler tasks.
+// To synchronously run tasks posted to TestWebThreads that use the shared
+// MessageLoop, call RunLoop::Run/RunUntilIdle() on the thread where the
+// TestWebThreadBundle lives. The destructor of TestWebThreadBundle runs
+// remaining TestWebThreads tasks, remaining blocking pool tasks, and remaining
+// BLOCK_SHUTDOWN task scheduler tasks.
 //
 // Some tests using the IO thread expect a MessageLoopForIO. Passing
 // IO_MAINLOOP will use a MessageLoopForIO for the main MessageLoop.
@@ -35,7 +35,6 @@
 class MessageLoop;
 namespace test {
 class ScopedAsyncTaskScheduler;
-class ScopedTaskScheduler;
 }  // namespace test
 }  // namespace base
 
@@ -54,7 +53,6 @@
     REAL_DB_THREAD = 1 << 1,
     REAL_FILE_THREAD = 1 << 2,
     REAL_IO_THREAD = 1 << 3,
-    REAL_TASK_SCHEDULER = 1 << 4,
   };
 
   TestWebThreadBundle();
@@ -68,7 +66,6 @@
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<base::test::ScopedAsyncTaskScheduler>
       scoped_async_task_scheduler_;
-  std::unique_ptr<base::test::ScopedTaskScheduler> scoped_task_scheduler_;
   std::unique_ptr<TestWebThread> ui_thread_;
   std::unique_ptr<TestWebThread> db_thread_;
   std::unique_ptr<TestWebThread> file_thread_;

ios/web/test/test_web_thread_bundle.cc

diff --git a/ios/web/test/test_web_thread_bundle.cc b/ios/web/test/test_web_thread_bundle.cc
index 14eb656..e6d776e4 100644
--- a/ios/web/test/test_web_thread_bundle.cc
+++ b/ios/web/test/test_web_thread_bundle.cc
@@ -8,7 +8,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/scoped_async_task_scheduler.h"
-#include "base/test/scoped_task_scheduler.h"
 #include "ios/web/public/test/test_web_thread.h"
 #include "ios/web/web_thread_impl.h"
 
@@ -53,7 +52,6 @@
   base::RunLoop().RunUntilIdle();
 
   scoped_async_task_scheduler_.reset();
-  scoped_task_scheduler_.reset();
 }
 
 void TestWebThreadBundle::Init(int options) {
@@ -65,13 +63,8 @@
 
   ui_thread_.reset(new TestWebThread(WebThread::UI, message_loop_.get()));
 
-  if (options & REAL_TASK_SCHEDULER) {
-    scoped_async_task_scheduler_ =
-        base::MakeUnique<base::test::ScopedAsyncTaskScheduler>();
-  } else {
-    scoped_task_scheduler_ =
-        base::MakeUnique<base::test::ScopedTaskScheduler>(message_loop_.get());
-  }
+  scoped_async_task_scheduler_ =
+      base::MakeUnique<base::test::ScopedAsyncTaskScheduler>();
 
   if (options & TestWebThreadBundle::REAL_DB_THREAD) {
     db_thread_.reset(new TestWebThread(WebThread::DB));