Fix Cronet tests.

components/cronet/stale_host_resolver_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 "components/cronet/stale_host_resolver.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/cronet/url_request_context_config.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "net/cert/cert_verifier.h"
 #include "net/dns/host_resolver_proc.h"
 #include "net/http/http_network_session.h"
 #include "net/log/net_log.h"
@@ skipping 52 matching lines @@
     return net::OK;
   }
 
  protected:
   ~MockHostResolverProc() override {}
 };
 
 class StaleHostResolverTest : public testing::Test {
  protected:
   StaleHostResolverTest()
-      : mock_proc_(new MockHostResolverProc()),
-        resolver_(nullptr),
-        resolve_pending_(false),
-        resolve_complete_(false) {}
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::IO),
+  mock_proc_(new MockHostResolverProc()), resolver_(nullptr),

[pauljensen, 2017/06/27 22:50:11]

This indentation is wacky...I guess the formater has a bug...

[mmenke, 2017/06/28 12:36:39]

Done.  Also merged and re-enabled tests.

+      resolve_pending_(false), resolve_complete_(false) {}
 
   ~StaleHostResolverTest() override {}
 
   void SetStaleDelay(int stale_delay_sec) {
     DCHECK(!resolver_);
 
     options_.delay = base::TimeDelta::FromSeconds(stale_delay_sec);
   }
 
   void SetStaleUsability(int max_expired_time_sec,
@@ skipping 151 matching lines @@
   }
 
   bool resolve_complete() const { return resolve_complete_; }
   int resolve_error() const { return resolve_error_; }
   const net::AddressList& resolve_addresses() const {
     return resolve_addresses_;
   }
 
  private:
   // Needed for HostResolver to run HostResolverProc callbacks.
-  base::MessageLoopForIO message_loop_for_io_;
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+
   scoped_refptr<MockHostResolverProc> mock_proc_;
 
   net::HostResolver* resolver_;
   StaleHostResolver::StaleOptions options_;
   std::unique_ptr<StaleHostResolver> stale_resolver_;
 
   base::TimeTicks now_;
   std::unique_ptr<net::HostResolver::Request> request_;
   bool resolve_pending_;
   bool resolve_complete_;
@@ skipping 228 matching lines @@
 
   EXPECT_TRUE(resolve_complete());
   EXPECT_EQ(net::OK, resolve_error());
   EXPECT_EQ(1u, resolve_addresses().size());
   EXPECT_EQ(kCacheAddress, resolve_addresses()[0].ToStringWithoutPort());
 }
 
 }  // namespace
 
 }  // namespace cronet