Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4622)

Unified Diff: chrome/browser/browser_main.cc

Issue 7283018: Introduce a policy to control the maximal number of connections per proxy server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make the bots happy with the policy template. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index d31fe38d8e6fe6a9f2d86bfad5ebebf6eddb2ca7..d79e4f4927cdd82fd5295be564d1a20b9a704654 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -277,7 +277,9 @@ MetricsService* BrowserMainParts::SetupMetricsAndFieldTrials(
// to send metrics.
field_trial_list_.reset(new base::FieldTrialList(metrics->GetClientId()));
- SetupFieldTrials(metrics->recording_active());
+ SetupFieldTrials(metrics->recording_active(),
+ local_state->IsManagedPreference(
+ prefs::kMaxConnectionsPerProxy));
// Initialize FieldTrialSynchronizer system. This is a singleton and is used
// for posting tasks via NewRunnableMethod. Its deleted when it goes out of
@@ -633,7 +635,8 @@ MetricsService* BrowserMainParts::InitializeMetrics(
return metrics;
}
-void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled) {
+void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled,
+ bool proxy_policy_is_set) {
if (metrics_recording_enabled)
chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
@@ -641,7 +644,10 @@ void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled) {
// ProxyConnectionsFieldTrial().
ConnectionFieldTrial();
SocketTimeoutFieldTrial();
- ProxyConnectionsFieldTrial();
+ // If a policy is defining the number of active connections this field test
+ // shoud not be performed.
+ if (!proxy_policy_is_set)
+ ProxyConnectionsFieldTrial();
prerender::ConfigurePrefetchAndPrerender(parsed_command_line());
SpdyFieldTrial();
ConnectBackupJobsFieldTrial();
« no previous file with comments | « chrome/browser/browser_main.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698