Revert 91842 - Introduce a policy to control the maximal number of connections per proxy server.

chrome/browser/browser_main.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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 259 matching lines @@
   // Must initialize metrics after labs have been converted into switches,
   // but before field trials are set up (so that client ID is available for
   // one-time randomized field trials).
   MetricsService* metrics = InitializeMetrics(parsed_command_line, local_state);
 
   // Initialize FieldTrialList to support FieldTrials that use one-time
   // randomization. The client ID will be empty if the user has not opted
   // to send metrics.
   field_trial_list_.reset(new base::FieldTrialList(metrics->GetClientId()));
 
-  SetupFieldTrials(metrics->recording_active(),
-                   local_state->IsManagedPreference(
-                       prefs::kMaxConnectionsPerProxy));
+  SetupFieldTrials(metrics->recording_active());
 
   // Initialize FieldTrialSynchronizer system. This is a singleton and is used
   // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
   // scope. Even though NewRunnableMethod does AddRef and Release, the object
   // will not be deleted after the Task is executed.
   field_trial_synchronizer_ = new FieldTrialSynchronizer();
 
   return metrics;
 }
 
@@ skipping 335 matching lines @@
   bool enabled = local_state->GetBoolean(prefs::kMetricsReportingEnabled);
 #endif  // #if defined(OS_CHROMEOS)
   if (enabled) {
     metrics->Start();
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   return metrics;
 }
 
-void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
-                                        bool proxy_policy_is_set) {
+void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled) {
   if (metrics_recording_enabled)
     chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
 
   // Note: make sure to call ConnectionFieldTrial() before
   // ProxyConnectionsFieldTrial().
   ConnectionFieldTrial();
   SocketTimeoutFieldTrial();
-  // If a policy is defining the number of active connections this field test
-  // shoud not be performed.
-  if (!proxy_policy_is_set)
-    ProxyConnectionsFieldTrial();
+  ProxyConnectionsFieldTrial();
   prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
   SpdyFieldTrial();
   ConnectBackupJobsFieldTrial();
   WarmConnectionFieldTrial();
 }
 
 // -----------------------------------------------------------------------------
 // TODO(viettrungluu): move more/rest of BrowserMain() into above structure
 
 namespace {
@@ skipping 1420 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return result_code;
 }