Use TaskScheduler instead of WorkerPool in url_request_simple_job.cc.

net/url_request/url_request_simple_job_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/url_request/url_request_simple_job.h"
 
 #include <memory>
 #include <utility>
 
 #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/threading/thread.h"
+#include "base/test/scoped_task_scheduler.h"
 #include "net/base/request_priority.h"
 #include "net/test/gtest_util.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::test::IsError;
 using net::test::IsOk;
 
 namespace net {
 
 namespace {
 
 const char kTestData[] = "Huge data array";
 const int kRangeFirstPosition = 5;
 const int kRangeLastPosition = 8;
 static_assert(kRangeFirstPosition > 0 &&
                   kRangeFirstPosition < kRangeLastPosition &&
                   kRangeLastPosition <
                       static_cast<int>(arraysize(kTestData) - 1),
               "invalid range");
 
 class MockSimpleJob : public URLRequestSimpleJob {
  public:
   MockSimpleJob(URLRequest* request,
                 NetworkDelegate* network_delegate,
-                scoped_refptr<base::TaskRunner> task_runner,
                 base::StringPiece data)
       : URLRequestSimpleJob(request, network_delegate),
-        data_(data.as_string()),
-        task_runner_(std::move(task_runner)) {}
+        data_(data.as_string()) {}
 
  protected:
   // URLRequestSimpleJob implementation:
   int GetData(std::string* mime_type,
               std::string* charset,
               std::string* data,
               const CompletionCallback& callback) const override {
     mime_type->assign("text/plain");
     charset->assign("US-ASCII");
     data->assign(data_);
     return OK;
   }
 
-  base::TaskRunner* GetTaskRunner() const override {
-    return task_runner_.get();
-  }
-
  private:
   ~MockSimpleJob() override {}
 
   const std::string data_;
 
-  const scoped_refptr<base::TaskRunner> task_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(MockSimpleJob);
 };
 
 class CancelAfterFirstReadURLRequestDelegate : public TestDelegate {
  public:
   CancelAfterFirstReadURLRequestDelegate() : run_loop_(new base::RunLoop) {}
 
   ~CancelAfterFirstReadURLRequestDelegate() override {}
 
   void OnResponseStarted(URLRequest* request, int net_error) override {
     DCHECK_NE(ERR_IO_PENDING, net_error);
     // net::TestDelegate will start the first read.
     TestDelegate::OnResponseStarted(request, net_error);
     request->Cancel();
     run_loop_->Quit();
   }
 
   void WaitUntilHeadersReceived() const { run_loop_->Run(); }
 
  private:
   std::unique_ptr<base::RunLoop> run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(CancelAfterFirstReadURLRequestDelegate);
 };
 
 class SimpleJobProtocolHandler :
     public URLRequestJobFactory::ProtocolHandler {
  public:
-  SimpleJobProtocolHandler(scoped_refptr<base::TaskRunner> task_runner)
-      : task_runner_(std::move(task_runner)) {}
+  SimpleJobProtocolHandler() = default;
   URLRequestJob* MaybeCreateJob(
       URLRequest* request,
       NetworkDelegate* network_delegate) const override {
     if (request->url().spec() == "data:empty")
-      return new MockSimpleJob(request, network_delegate, task_runner_, "");
-    return new MockSimpleJob(request, network_delegate, task_runner_,
-                             kTestData);
+      return new MockSimpleJob(request, network_delegate, "");
+    return new MockSimpleJob(request, network_delegate, kTestData);
   }
 
   ~SimpleJobProtocolHandler() override {}
 
  private:
-  const scoped_refptr<base::TaskRunner> task_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(SimpleJobProtocolHandler);
 };
 
 class URLRequestSimpleJobTest : public ::testing::Test {
  public:
   URLRequestSimpleJobTest()
-      : worker_thread_("URLRequestSimpleJobTest"), context_(true) {
-    EXPECT_TRUE(worker_thread_.Start());
-
+      : scoped_task_scheduler_(base::MessageLoop::current()), context_(true) {
     job_factory_.SetProtocolHandler(
-        "data", base::MakeUnique<SimpleJobProtocolHandler>(task_runner()));
+        "data", base::MakeUnique<SimpleJobProtocolHandler>());
     context_.set_job_factory(&job_factory_);
     context_.Init();
 
     request_ =
         context_.CreateRequest(GURL("data:test"), DEFAULT_PRIORITY, &delegate_);
   }
 
   void StartRequest(const HttpRequestHeaders* headers) {
     if (headers)
       request_->SetExtraRequestHeaders(*headers);
     request_->Start();
 
     EXPECT_TRUE(request_->is_pending());
     base::RunLoop().Run();
     EXPECT_FALSE(request_->is_pending());
   }
 
-  scoped_refptr<base::SequencedTaskRunner> task_runner() {
-    return worker_thread_.task_runner();
-  }
+ private:

[xunjieli, 2017/02/09 16:43:08]

nit: private after protected

[fdoray, 2017/02/10 16:08:50]

We recommend keeping ScopedTaskScheduler first because it allows other members
to post to it in their constructor and destructor. I'll update the documentation
of ScopedTaskScheduler to make this explicit.

Keeping |scoped_task_scheduler_| private makes it clear that no test uses it
directly.

[xunjieli, 2017/02/10 16:15:06]

Acknowledged. Please add a one-line comment here as well so it won't be
accidentally formatted.

[fdoray, 2017/02/10 16:17:24]

After reflection, I decided to move it to the end since there is no good reason
to keep it first in this particular test.

+  base::test::ScopedTaskScheduler scoped_task_scheduler_;
 
  protected:
-  base::Thread worker_thread_;
   TestURLRequestContext context_;
   URLRequestJobFactoryImpl job_factory_;
   TestDelegate delegate_;
   std::unique_ptr<URLRequest> request_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestSimpleJobTest);
 };
 
 }  // namespace
 
@@ skipping 65 matching lines @@
   EXPECT_EQ(1, delegate_.response_started_count());
 }
 
 TEST_F(URLRequestSimpleJobTest, CancelAfterFirstReadStarted) {
   CancelAfterFirstReadURLRequestDelegate cancel_delegate;
   request_ = context_.CreateRequest(GURL("data:cancel"), DEFAULT_PRIORITY,
                                     &cancel_delegate);
   request_->Start();
   cancel_delegate.WaitUntilHeadersReceived();
 
-  // Feed a dummy task to the SequencedTaskRunner to make sure that the
-  // callbacks which are invoked in ReadRawData have completed safely.
-  base::RunLoop run_loop;
-  EXPECT_TRUE(task_runner()->PostTaskAndReply(
-      FROM_HERE, base::Bind(&base::DoNothing), run_loop.QuitClosure()));
-  run_loop.Run();
+  // Run ScopedTaskScheduler tasks.
+  base::RunLoop().RunUntilIdle();
 
   EXPECT_THAT(cancel_delegate.request_status(), IsError(ERR_ABORTED));
   EXPECT_EQ(1, cancel_delegate.response_started_count());
   EXPECT_EQ("", cancel_delegate.data_received());
   // Destroy the request so it doesn't outlive its delegate.
   request_.reset();
 }
 
 }  // namespace net