Instantiate ScopedTaskEnvironment in net unittests.

net/url_request/url_request_simple_job_unittest.cc

Index: net/url_request/url_request_simple_job_unittest.cc
diff --git a/net/url_request/url_request_simple_job_unittest.cc b/net/url_request/url_request_simple_job_unittest.cc
index 088b157e525845a458de5b80382df87d4c64f11f..895616bff00a649e02057748d55ac250038edcd9 100644
--- a/net/url_request/url_request_simple_job_unittest.cc
+++ b/net/url_request/url_request_simple_job_unittest.cc
@@ -10,12 +10,11 @@
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/scoped_task_scheduler.h"
+#include "base/task_scheduler/task_scheduler.h"
 #include "net/base/request_priority.h"
 #include "net/test/gtest_util.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
@@ -112,8 +111,7 @@ class SimpleJobProtocolHandler :
 
 class URLRequestSimpleJobTest : public ::testing::Test {
  public:
-  URLRequestSimpleJobTest()
-      : context_(true), scoped_task_scheduler_(base::MessageLoop::current()) {
+  URLRequestSimpleJobTest() : context_(true) {
     job_factory_.SetProtocolHandler(
         "data", base::MakeUnique<SimpleJobProtocolHandler>());
     context_.set_job_factory(&job_factory_);
@@ -140,8 +138,6 @@ class URLRequestSimpleJobTest : public ::testing::Test {
   std::unique_ptr<URLRequest> request_;
 
  private:
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
-
   DISALLOW_COPY_AND_ASSIGN(URLRequestSimpleJobTest);
 };
 
@@ -223,7 +219,8 @@ TEST_F(URLRequestSimpleJobTest, CancelAfterFirstReadStarted) {
   request_->Start();
   cancel_delegate.WaitUntilHeadersReceived();
 
-  // Run ScopedTaskScheduler tasks.
+  // Run TaskScheduler tasks and their reply on the main thread.
+  base::TaskScheduler::GetInstance()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(cancel_delegate.request_status(), IsError(ERR_ABORTED));