Move creation and ownership of ResourceDispatcherHost and PluginService to content. This gives a ...

chrome/browser/io_thread.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/debug/leak_tracker.h"
 #include "base/logging.h"
-#include "base/metrics/field_trial.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/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/media/media_internals.h"
@@ skipping 89 matching lines @@
     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;
     }
-  } else {
-    // Set up a field trial to see what impact the total number of concurrent
-    // resolutions have on DNS resolutions.
-    base::FieldTrial::Probability kDivisor = 1000;
-    // For each option (i.e., non-default), we have a fixed probability.
-    base::FieldTrial::Probability kProbabilityPerGroup = 100;  // 10%.
-
-    // After June 30, 2011 builds, it will always be in default group
-    // (parallel_default).
-    scoped_refptr<base::FieldTrial> trial(
-        new base::FieldTrial(
-            "DnsParallelism", kDivisor, "parallel_default", 2011, 6, 30));
-
-    // List options with different counts.
-    // Firefox limits total to 8 in parallel, and default is currently 50.
-    int parallel_6 = trial->AppendGroup("parallel_6", kProbabilityPerGroup);
-    int parallel_7 = trial->AppendGroup("parallel_7", kProbabilityPerGroup);
-    int parallel_8 = trial->AppendGroup("parallel_8", kProbabilityPerGroup);
-    int parallel_9 = trial->AppendGroup("parallel_9", kProbabilityPerGroup);
-    int parallel_10 = trial->AppendGroup("parallel_10", kProbabilityPerGroup);
-    int parallel_14 = trial->AppendGroup("parallel_14", kProbabilityPerGroup);
-    int parallel_20 = trial->AppendGroup("parallel_20", kProbabilityPerGroup);
-
-    if (trial->group() == parallel_6)
-      parallelism = 6;
-    else if (trial->group() == parallel_7)
-      parallelism = 7;
-    else if (trial->group() == parallel_8)
-      parallelism = 8;
-    else if (trial->group() == parallel_9)
-      parallelism = 9;
-    else if (trial->group() == parallel_10)
-      parallelism = 10;
-    else if (trial->group() == parallel_14)
-      parallelism = 14;
-    else if (trial->group() == parallel_20)
-      parallelism = 20;
   }
 
   size_t retry_attempts = net::HostResolver::kDefaultRetryAttempts;
 
   // Use the retry attempts override from the command-line, if any.
   if (command_line.HasSwitch(switches::kHostResolverRetryAttempts)) {
     std::string s =
         command_line.GetSwitchValueASCII(switches::kHostResolverRetryAttempts);
     // Parse the switch (it should be a non-negative integer).
     int n;
@@ skipping 499 matching lines @@
   system_params.network_delegate = globals_->system_network_delegate.get();
   system_params.net_log = net_log_;
   globals_->system_http_transaction_factory.reset(
       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 =
       ConstructSystemRequestContext(globals_, net_log_);
 }