Fix Cronet tests.

components/cronet/url_request_context_config_unittest.cc

 // Copyright 2015 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/url_request_context_config.h"
 
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/values.h"
 #include "net/cert/cert_verifier.h"
 #include "net/http/http_network_session.h"
 #include "net/log/net_log.h"
 #include "net/log/net_log_with_source.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cronet {
 
-// Test is flaky. See https://crbug.com/737326.
-TEST(URLRequestContextConfigTest, DISABLED_TestExperimentalOptionParsing) {
+TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
+  base::test::ScopedTaskEnvironment scoped_task_environment_(
+      base::test::ScopedTaskEnvironment::MainThreadType::IO);
+
   URLRequestContextConfig config(
       // Enable QUIC.
       true,
       // QUIC User Agent ID.
       "Default QUIC User Agent ID",
       // Enable SPDY.
       true,
       // Enable SDCH.
       false,
       // Enable Brotli.
@@ skipping 24 matching lines @@
       "\"disable_ipv6_on_wifi\":true}",
       // MockCertVerifier to use for testing purposes.
       std::unique_ptr<net::CertVerifier>(),
       // Enable network quality estimator.
       false,
       // Enable Public Key Pinning bypass for local trust anchors.
       true,
       // Certificate verifier cache data.
       "");
 
-  base::MessageLoop message_loop;
   net::URLRequestContextBuilder builder;
   net::NetLog net_log;
   config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr);
   EXPECT_FALSE(config.effective_experimental_options->HasKey("UnknownOption"));
   // Set a ProxyConfigService to avoid DCHECK failure when building.
   builder.set_proxy_config_service(
       base::MakeUnique<net::ProxyConfigServiceFixed>(
           net::ProxyConfig::CreateDirect()));
   std::unique_ptr<net::URLRequestContext> context(builder.Build());
   const net::HttpNetworkSession::Params* params =
@@ skipping 25 matching lines @@
 
   // Check IPv6 is disabled when on wifi.
   EXPECT_TRUE(context->host_resolver()->GetNoIPv6OnWifi());
 
   net::HostResolver::RequestInfo info(net::HostPortPair("abcde", 80));
   net::AddressList addresses;
   EXPECT_EQ(net::OK, context->host_resolver()->ResolveFromCache(
                          info, &addresses, net::NetLogWithSource()));
 }
 
-// Test is flaky. See https://crbug.com/737326.
-TEST(URLRequestContextConfigTest, DISABLED_SetQuicConnectionMigrationOptions) {
+TEST(URLRequestContextConfigTest, SetQuicConnectionMigrationOptions) {
+  base::test::ScopedTaskEnvironment scoped_task_environment_(
+      base::test::ScopedTaskEnvironment::MainThreadType::IO);
+
   URLRequestContextConfig config(
       // Enable QUIC.
       true,
       // QUIC User Agent ID.
       "Default QUIC User Agent ID",
       // Enable SPDY.
       true,
       // Enable SDCH.
       false,
       // Enable Brotli.
@@ skipping 14 matching lines @@
       "\"migrate_sessions_early\":true}}",
       // MockCertVerifier to use for testing purposes.
       std::unique_ptr<net::CertVerifier>(),
       // Enable network quality estimator.
       false,
       // Enable Public Key Pinning bypass for local trust anchors.
       true,
       // Certificate verifier cache data.
       "");
 
-  base::MessageLoop message_loop;
   net::URLRequestContextBuilder builder;
   net::NetLog net_log;
   config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr);
   // Set a ProxyConfigService to avoid DCHECK failure when building.
   builder.set_proxy_config_service(
       base::MakeUnique<net::ProxyConfigServiceFixed>(
           net::ProxyConfig::CreateDirect()));
   std::unique_ptr<net::URLRequestContext> context(builder.Build());
   const net::HttpNetworkSession::Params* params =
       context->GetNetworkSessionParams();
 
   EXPECT_FALSE(params->quic_close_sessions_on_ip_change);
   EXPECT_TRUE(params->quic_migrate_sessions_on_network_change);
   EXPECT_TRUE(params->quic_migrate_sessions_early);
 }
 
 // See stale_host_resolver_unittest.cc for test of StaleDNS options.
 
 }  // namespace cronet