[net] Add AsyncDns field trial.

chrome/browser/io_thread.cc

 // Copyright (c) 2012 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 "chrome/browser/io_thread.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/leak_tracker.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/event_router_forwarder.h"
+#include "chrome/browser/net/async_dns_field_trial.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/http_pipelining_compatibility_client.h"
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/net/pref_proxy_config_tracker.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 68 matching lines @@
   virtual ~SystemURLRequestContext() {
 #if defined(USE_NSS)
     net::SetURLRequestContextForNSSHttpIO(NULL);
 #endif  // defined(USE_NSS)
   }
 };
 
 net::HostResolver* CreateGlobalHostResolver(net::NetLog* net_log) {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
+  bool allow_async_dns_field_trial = true;
+
   size_t parallelism = net::HostResolver::kDefaultParallelism;
 
   // Use the concurrency override from the command-line, if any.
   if (command_line.HasSwitch(switches::kHostResolverParallelism)) {
+    allow_async_dns_field_trial = false;
     std::string s =
         command_line.GetSwitchValueASCII(switches::kHostResolverParallelism);
 
     // Parse the switch (it should be a positive integer formatted as decimal).
     int n;
     if (base::StringToInt(s, &n) && n > 0) {
       parallelism = static_cast<size_t>(n);
     } else {
       LOG(ERROR) << "Invalid switch for host resolver parallelism: " << s;
     }
   }
 
   size_t retry_attempts = net::HostResolver::kDefaultRetryAttempts;
 
   // Use the retry attempts override from the command-line, if any.
   if (command_line.HasSwitch(switches::kHostResolverRetryAttempts)) {
+    allow_async_dns_field_trial = false;
     std::string s =
         command_line.GetSwitchValueASCII(switches::kHostResolverRetryAttempts);
     // Parse the switch (it should be a non-negative integer).
     int n;
     if (base::StringToInt(s, &n) && n >= 0) {
       retry_attempts = static_cast<size_t>(n);
     } else {
       LOG(ERROR) << "Invalid switch for host resolver retry attempts: " << s;
     }
   }
 
   net::HostResolver* global_host_resolver = NULL;
+  bool use_async = false;
   if (command_line.HasSwitch(switches::kEnableAsyncDns)) {
+    allow_async_dns_field_trial = false;
+    use_async = true;
+  } else if (command_line.HasSwitch(switches::kDisableAsyncDns)) {
+    allow_async_dns_field_trial = false;
+    use_async = false;
+  }
+
+  if (allow_async_dns_field_trial)
+    use_async = chrome_browser_net::ConfigureAsyncDnsFieldTrial();
+
+  if (use_async) {
     global_host_resolver =
         net::CreateAsyncHostResolver(parallelism, retry_attempts, net_log);
-  }
-
-  if (!global_host_resolver) {
+  } else {
     global_host_resolver =
-      net::CreateSystemHostResolver(parallelism, retry_attempts, net_log);
+        net::CreateSystemHostResolver(parallelism, retry_attempts, net_log);
   }
 
   // Determine if we should disable IPv6 support.
   if (!command_line.HasSwitch(switches::kEnableIPv6)) {
     if (command_line.HasSwitch(switches::kDisableIPv6)) {
       global_host_resolver->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
     } else {
       global_host_resolver->ProbeIPv6Support();
     }
   }
@@ skipping 469 matching lines @@
       new net::HttpNetworkLayer(
           new net::HttpNetworkSession(system_params)));
   globals_->system_ftp_transaction_factory.reset(
       new net::FtpNetworkLayer(globals_->host_resolver.get()));
   globals_->system_request_context.reset(
       ConstructSystemRequestContext(globals_, net_log_));
 
   sdch_manager_->set_sdch_fetcher(
       new SdchDictionaryFetcher(system_url_request_context_getter_.get()));
 }