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..001cac922ec765d94c61e2b45c4d1e1271147f39 100644
--- a/net/url_request/url_request_simple_job_unittest.cc
+++ b/net/url_request/url_request_simple_job_unittest.cc
@@ -10,14 +10,14 @@
 #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/test/scoped_task_environment.h"
 #include "net/base/request_priority.h"
 #include "net/test/gtest_util.h"
+#include "net/test/net_test_suite.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
@@ -112,8 +112,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 +139,6 @@ class URLRequestSimpleJobTest : public ::testing::Test {
   std::unique_ptr<URLRequest> request_;
 
  private:
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
-
   DISALLOW_COPY_AND_ASSIGN(URLRequestSimpleJobTest);
 };
 
@@ -223,8 +220,8 @@ TEST_F(URLRequestSimpleJobTest, CancelAfterFirstReadStarted) {
   request_->Start();
   cancel_delegate.WaitUntilHeadersReceived();
 
-  // Run ScopedTaskScheduler tasks.
-  base::RunLoop().RunUntilIdle();
+  // Run TaskScheduler tasks and their reply on the main thread.
+  NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle();

[mmenke, 2017/05/10 15:43:44]

Why do only some RunUntilIdle calls need to be switched?  Just skimming over net
unittests, there are still a ton of RunUntilIdle calls.  Are we changing the
behavior of all of them?

[fdoray, 2017/05/10 16:16:12]

This CL removes ScopedTaskScheduler from individual net/ tests and adds a global
ScopedTaskEnvironment.

Within the scope of a ScopedTaskScheduler (deprecated):

  RunLoop().RunUntilIdle()
    Runs TaskScheduler tasks: Yes
    Runs main MessageLoop tasks: Yes
  NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle()
    Runs TaskScheduler tasks: Yes
    Runs main MessageLoop tasks: Yes

Within the scope of a ScopedTaskEnvironment:

  RunLoop().RunUntilIdle()
    Runs TaskScheduler tasks: *NO*
    Runs main MessageLoop tasks: Yes
  NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle()
    Runs TaskScheduler tasks: *YES*
    Runs main MessageLoop tasks: Yes

Replacing RunLoop().RunUntilIdle() with
NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle() is not necessary if we
don't expect to run TaskScheduler tasks.

 
   EXPECT_THAT(cancel_delegate.request_status(), IsError(ERR_ABORTED));
   EXPECT_EQ(1, cancel_delegate.response_started_count());