Instantiate ScopedTaskEnvironment in net unittests.

net/ssl/channel_id_service_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/ssl/channel_id_service.h"
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner.h"
 #include "base/task_scheduler/task_scheduler.h"
-#include "base/test/scoped_task_scheduler.h"
+#include "base/test/null_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "crypto/ec_private_key.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/default_channel_id_store.h"
 #include "net/test/channel_id_test_util.h"
 #include "net/test/gtest_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 54 matching lines @@
   if (err == OK)
     channel_id_count_ = 1;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback_, err, server_identifier_,
                             base::Passed(key ? key->Copy() : nullptr)));
 }
 
 class ChannelIDServiceTest : public testing::Test {
  public:
   ChannelIDServiceTest()
-      : scoped_task_scheduler_(base::MessageLoop::current()),
-        service_(new ChannelIDService(new DefaultChannelIDStore(NULL))) {}
+      : service_(new ChannelIDService(new DefaultChannelIDStore(NULL))) {}
 
  protected:
-  base::test::ScopedTaskScheduler scoped_task_scheduler_;
   std::unique_ptr<ChannelIDService> service_;
 };
 
 TEST_F(ChannelIDServiceTest, GetDomainForHost) {
   EXPECT_EQ("google.com",
             ChannelIDService::GetDomainForHost("google.com"));
   EXPECT_EQ("google.com",
             ChannelIDService::GetDomainForHost("www.google.com"));
   EXPECT_EQ("foo.appspot.com",
             ChannelIDService::GetDomainForHost("foo.appspot.com"));
@@ skipping 186 matching lines @@
 
   error = service_->GetOrCreateChannelID(host, &key, base::Bind(&FailTest),
                                          &request);
   EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request.is_active());
   request.Cancel();
   EXPECT_FALSE(request.is_active());
 
   // Wait for reply from ChannelIDServiceWorker to be posted back to the
   // ChannelIDService.
+  base::TaskScheduler::GetInstance()->FlushForTesting();
   base::RunLoop().RunUntilIdle();
 
   // Even though the original request was cancelled, the service will still
   // store the result, it just doesn't call the callback.
   EXPECT_EQ(1, service_->channel_id_count());
 }
 
 // Tests that destructing the Request cancels the request.
 TEST_F(ChannelIDServiceTest, CancelRequestByHandleDestruction) {
   std::string host("encrypted.google.com");
   std::unique_ptr<crypto::ECPrivateKey> key;
   int error;
   std::unique_ptr<ChannelIDService::Request> request(
       new ChannelIDService::Request());
 
   error = service_->GetOrCreateChannelID(host, &key, base::Bind(&FailTest),
                                          request.get());
   EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request->is_active());
 
   // Delete the Request object.
   request.reset();
 
   // Wait for reply from ChannelIDServiceWorker to be posted back to the
   // ChannelIDService.
+  base::TaskScheduler::GetInstance()->FlushForTesting();
   base::RunLoop().RunUntilIdle();

[mmenke, 2017/05/09 15:40:44]

This means something different than the old code, right?  This fails if there's
a task that posts a task that does what we're waiting for?

[fdoray, 2017/05/09 21:43:47]

Addressed by calling ScopedTaskEnvironment::RunUntilIdle() instead.

 
   // Even though the original request was cancelled, the service will still
   // store the result, it just doesn't call the callback.
   EXPECT_EQ(1, service_->channel_id_count());
 }
 
 TEST_F(ChannelIDServiceTest, DestructionWithPendingRequest) {
   std::string host("encrypted.google.com");
   std::unique_ptr<crypto::ECPrivateKey> key;
   int error;
   ChannelIDService::Request request;
 
   error = service_->GetOrCreateChannelID(host, &key, base::Bind(&FailTest),
                                          &request);
   EXPECT_THAT(error, IsError(ERR_IO_PENDING));
   EXPECT_TRUE(request.is_active());
 
   // Cancel request and destroy the ChannelIDService.
   request.Cancel();
   service_.reset();
 
   // ChannelIDServiceWorker should not post anything back to the
   // non-existent ChannelIDService, but run the loop just to be sure it
   // doesn't.
   base::RunLoop().RunUntilIdle();
 
   // If we got here without crashing or a valgrind error, it worked.
 }
 
-// Tests that shutting down the TaskScheduler and then making new requests
-// gracefully fails.
-// This is a regression test for http://crbug.com/236387
+// Tests that making new requests when the ChannelIDService can no longer post
+// tasks gracefully fails. This is a regression test for http://crbug.com/236387
 TEST_F(ChannelIDServiceTest, RequestAfterPoolShutdown) {
-  // Drop all tasks posted to TaskScheduler from now on.
-  base::TaskScheduler::GetInstance()->Shutdown();
+  service_->set_task_runner_for_testing(
+      make_scoped_refptr(new base::NullTaskRunner()));
 
   // Make a request that will force synchronous completion.
   std::string host("encrypted.google.com");
   std::unique_ptr<crypto::ECPrivateKey> key;
   int error;
   ChannelIDService::Request request;
 
   error = service_->GetOrCreateChannelID(host, &key, base::Bind(&FailTest),
                                          &request);
   // If we got here without crashing or a valgrind error, it worked.
@@ skipping 230 matching lines @@
   EXPECT_EQ(1u, service_->inflight_joins());
   EXPECT_TRUE(key1);
   EXPECT_TRUE(KeysEqual(key1.get(), key2.get()));
   EXPECT_FALSE(request1.is_active());
   EXPECT_FALSE(request2.is_active());
 }
 
 }  // namespace
 
 }  // namespace net