Add host resolver rules experimental flag for Cronet

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/values.h"
 #include "net/cert/cert_verifier.h"
 #include "net/http/http_network_session.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(URLRequestContextConfigTest, SetQuicExperimentalOptions) {
+TEST(URLRequestContextConfigTest, TestExperimentalOptionPassing) {
   URLRequestContextConfig config(
       // Enable QUIC.
       true,
       // QUIC User Agent ID.
       "Default QUIC User Agent ID",
       // Enable SPDY.
       true,
       // Enable SDCH.
       false,
       // Type of http cache.
@@ skipping 10 matching lines @@
       // JSON encoded experimental options.
       "{\"QUIC\":{\"max_server_configs_stored_in_properties\":2,"
       "\"delay_tcp_race\":true,"
       "\"max_number_of_lossy_connections\":10,"
       "\"prefer_aes\":true,"
       "\"user_agent_id\":\"Custom QUIC UAID\","
       "\"packet_loss_threshold\":0.5,"
       "\"idle_connection_timeout_seconds\":300,"
       "\"close_sessions_on_ip_change\":true,"
       "\"connection_options\":\"TIME,TBBR,REJ\"},"
-      "\"AsyncDNS\":{\"enable\":true}}",
+      "\"AsyncDNS\":{\"enable\":true},"
+      "\"HostResolverRules\":{\"host_resolver_rules\":"
+      "\"MAP * 127.0.0.1\"}}",
       // Data reduction proxy key.
       "",
       // Data reduction proxy.
       "",
       // Fallback data reduction proxy.
       "",
       // Data reduction proxy secure proxy check URL.
       "",
       // MockCertVerifier to use for testing purposes.
       std::unique_ptr<net::CertVerifier>());
 
   net::URLRequestContextBuilder builder;
-  net::NetLog net_log;
-  config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr);
+  config.ConfigureURLRequestContextBuilder(&builder, new net::NetLog(),

[pauljensen, 2016/06/10 14:19:37]

why the change to create NetLog on the heap?  looks like a leak

[mgersh, 2016/06/29 17:43:31]

Done.

+                                           nullptr);
   // Set a ProxyConfigService to avoid DCHECK failure when building.
   builder.set_proxy_config_service(base::WrapUnique(
       new net::ProxyConfigServiceFixed(net::ProxyConfig::CreateDirect())));
   std::unique_ptr<net::URLRequestContext> context(builder.Build());
   const net::HttpNetworkSession::Params* params =
       context->GetNetworkSessionParams();
   // Check Quic Connection options.
   net::QuicTagVector quic_connection_options;
   quic_connection_options.push_back(net::kTIME);
   quic_connection_options.push_back(net::kTBBR);
@@ skipping 16 matching lines @@
   EXPECT_EQ(10, params->quic_max_number_of_lossy_connections);
   EXPECT_FLOAT_EQ(0.5f, params->quic_packet_loss_threshold);
 
   // Check idle_connection_timeout_seconds.
   EXPECT_EQ(300, params->quic_idle_connection_timeout_seconds);
 
   EXPECT_TRUE(params->quic_close_sessions_on_ip_change);
   EXPECT_FALSE(params->quic_migrate_sessions_on_network_change);
 
   // Check AsyncDNS resolver is enabled.
   EXPECT_TRUE(context->host_resolver()->GetDnsConfigAsValue());

[pauljensen, 2016/06/10 14:19:37]

Please add a test that the rules were installed in the host resolver

[mgersh, 2016/06/29 17:43:31]

Done.

 }
 
 TEST(URLRequestContextConfigTest, SetQuicConnectionMigrationOptions) {
   URLRequestContextConfig config(
       // Enable QUIC.
       true,
       // QUIC User Agent ID.
       "Default QUIC User Agent ID",
       // Enable SPDY.
       true,
@@ skipping 18 matching lines @@
       // Data reduction proxy.
       "",
       // Fallback data reduction proxy.
       "",
       // Data reduction proxy secure proxy check URL.
       "",
       // MockCertVerifier to use for testing purposes.
       std::unique_ptr<net::CertVerifier>());
 
   net::URLRequestContextBuilder builder;
-  net::NetLog net_log;
-  config.ConfigureURLRequestContextBuilder(&builder, &net_log, nullptr);
+  config.ConfigureURLRequestContextBuilder(&builder, new net::NetLog(),
+                                           nullptr);
   // Set a ProxyConfigService to avoid DCHECK failure when building.
   builder.set_proxy_config_service(base::WrapUnique(
       new 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);
 }
 
 }  // namespace cronet