Fix Cronet tests.

components/cronet/stale_host_resolver_unittest.cc

Index: components/cronet/stale_host_resolver_unittest.cc
diff --git a/components/cronet/stale_host_resolver_unittest.cc b/components/cronet/stale_host_resolver_unittest.cc
index 0bff86e82c945bad4cd13014e3e4cec331ad8779..27f6b892370bfb489a32f8e6d83b8928726f4087 100644
--- a/components/cronet/stale_host_resolver_unittest.cc
+++ b/components/cronet/stale_host_resolver_unittest.cc
@@ -8,8 +8,8 @@
 #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"
@@ -82,10 +82,10 @@ class MockHostResolverProc : public net::HostResolverProc {
 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 {}
 
@@ -257,7 +257,8 @@ class StaleHostResolverTest : public testing::Test {
 
  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_;