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

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc	(revision 91842)
+++ chrome/browser/browser_main.cc	(working copy)
@@ -277,9 +277,7 @@
   // 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
@@ -635,8 +633,7 @@
   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();
 
@@ -644,10 +641,7 @@
   // 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();