Instantiate ScopedTaskEnvironment in net unittests.

net/url_request/url_request_file_dir_job_unittest.cc

 // Copyright 2016 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_file_dir_job.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/test/scoped_task_scheduler.h"
+#include "base/test/scoped_task_environment.h"
 #include "net/base/filename_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.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.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 {
@@ skipping 56 matching lines @@
   bool got_response_started() const { return got_response_started_; }
 
  private:
   bool got_response_started_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestDirectoryURLRequestDelegate);
 };
 
 class URLRequestFileDirTest : public testing::Test {
  public:
-  URLRequestFileDirTest()
-      : scoped_task_scheduler_(base::MessageLoop::current()),
-        buffer_(new IOBuffer(kBufferSize)) {}
+  URLRequestFileDirTest() : buffer_(new IOBuffer(kBufferSize)) {}
 
  protected:
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
   TestURLRequestContext context_;
   TestDirectoryURLRequestDelegate delegate_;
   scoped_refptr<IOBuffer> buffer_;
 };
 
 TEST_F(URLRequestFileDirTest, ListCompletionOnNoPending) {
   base::ScopedTempDir directory;
   // It is necessary to pass an existing directory to UrlRequest object,
   // but it will be deleted for testing purpose after request is started.
   ASSERT_TRUE(directory.CreateUniqueTempDir());
   TestJobFactory factory(directory.GetPath());
   context_.set_job_factory(&factory);
   std::unique_ptr<URLRequest> request(context_.CreateRequest(
       FilePathToFileURL(
           directory.GetPath().AppendASCII("this_path_does_not_exist")),
       DEFAULT_PRIORITY, &delegate_, TRAFFIC_ANNOTATION_FOR_TESTS));
 
   request->Start();
   ASSERT_TRUE(directory.Delete());
 
   // Since the DirectoryLister is running on the network thread, this
   // will spin the message loop until the read error is returned to the
   // URLRequestFileDirJob.
-  base::RunLoop().RunUntilIdle();
+  NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle();
   ASSERT_TRUE(delegate_.got_response_started());
 
   int bytes_read = request->Read(buffer_.get(), kBufferSize);
 
   // The URLRequestFileDirJobShould return the cached read error synchronously.
   // If it's not returned synchronously, the code path this is intended to test
   // was not executed.
   EXPECT_THAT(bytes_read, IsError(ERR_FILE_NOT_FOUND));
 }
 
 // Test the case where reading the response completes synchronously.
 TEST_F(URLRequestFileDirTest, DirectoryWithASingleFileSync) {
   base::ScopedTempDir directory;
   ASSERT_TRUE(directory.CreateUniqueTempDir());
   base::FilePath path;
   base::CreateTemporaryFileInDir(directory.GetPath(), &path);
 
   TestJobFactory factory(directory.GetPath());
   context_.set_job_factory(&factory);
 
   std::unique_ptr<URLRequest> request(
       context_.CreateRequest(FilePathToFileURL(path), DEFAULT_PRIORITY,
                              &delegate_, TRAFFIC_ANNOTATION_FOR_TESTS));
   request->Start();
   EXPECT_TRUE(request->is_pending());
 
   // Since the DirectoryLister is running on the network thread, this will spin
   // the message loop until the URLRequetsFileDirJob has received the
   // entire directory listing and cached it.
-  base::RunLoop().RunUntilIdle();
+  NetTestSuite::GetScopedTaskEnvironment()->RunUntilIdle();
 
   // This will complete synchronously, since the URLRequetsFileDirJob had
   // directory listing cached in memory.
   int bytes_read = request->Read(buffer_.get(), kBufferSize);
 
   ASSERT_GT(bytes_read, 0);
   ASSERT_LE(bytes_read, kBufferSize);
   std::string data(buffer_->data(), bytes_read);
   EXPECT_TRUE(data.find(directory.GetPath().BaseName().MaybeAsASCII()) !=
               std::string::npos);
@@ skipping 82 matching lines @@
   ASSERT_GT(delegate.bytes_received(), 0);
   ASSERT_LE(delegate.bytes_received(), kBufferSize);
   EXPECT_TRUE(delegate.data_received().find(
                   directory.GetPath().BaseName().MaybeAsASCII()) !=
               std::string::npos);
 }
 
 }  // namespace
 
 }  // namespace net