diff options
Diffstat (limited to 'chrome/browser')
7 files changed, 7 insertions, 36 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index d79e4f4..d31fe38 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -277,9 +277,7 @@ MetricsService* BrowserMainParts::SetupMetricsAndFieldTrials( // 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 @@ MetricsService* BrowserMainParts::InitializeMetrics( 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 @@ void BrowserMainParts::SetupFieldTrials(bool metrics_recording_enabled, // 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(); diff --git a/chrome/browser/browser_main.h b/chrome/browser/browser_main.h index 85dce6f..e13a12d 100644 --- a/chrome/browser/browser_main.h +++ b/chrome/browser/browser_main.h @@ -147,8 +147,7 @@ class BrowserMainParts { const PrefService* local_state); // Add an invocation of your field trial init function to this method. - void SetupFieldTrials(bool metrics_recording_enabled, - bool proxy_policy_is_set); + void SetupFieldTrials(bool metrics_recording_enabled); // Members initialized on construction --------------------------------------- diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index b616348..f99f38b 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -77,7 +77,6 @@ #include "content/browser/renderer_host/resource_dispatcher_host.h" #include "content/common/notification_service.h" #include "ipc/ipc_logging.h" -#include "net/socket/client_socket_pool_manager.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" @@ -850,15 +849,6 @@ void BrowserProcessImpl::CreateLocalState() { // able so we need to have it when initializing the profiles. local_state_->RegisterFilePathPref(prefs::kDiskCacheDir, FilePath()); - // Another policy that needs to be defined before the net subsystem is - // initialized is MaxConnectionsPerProxy so we do it here. - local_state_->RegisterIntegerPref(prefs::kMaxConnectionsPerProxy, - net::kDefaultMaxSocketsPerProxyServer); - int max_per_proxy = local_state_->GetInteger(prefs::kMaxConnectionsPerProxy); - net::ClientSocketPoolManager::set_max_sockets_per_proxy_server( - std::max(std::min(max_per_proxy, 99), - net::ClientSocketPoolManager::max_sockets_per_group())); - // This is observed by ChildProcessSecurityPolicy, which lives in content/ // though, so it can't register itself. local_state_->RegisterListPref(prefs::kDisabledSchemes); diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index cf44547..3e62c8d 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -274,8 +274,6 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry prefs::kEditBookmarksEnabled }, { Value::TYPE_BOOLEAN, kPolicyAllowFileSelectionDialogs, prefs::kAllowFileSelectionDialogs }, - { Value::TYPE_INTEGER, kPolicyMaxConnectionsPerProxy, - prefs::kMaxConnectionsPerProxy }, #if defined(OS_CHROMEOS) { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend, @@ -1067,8 +1065,6 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { key::kAllowFileSelectionDialogs }, { kPolicyDiskCacheDir, Value::TYPE_STRING, key::kDiskCacheDir }, - { kPolicyMaxConnectionsPerProxy, Value::TYPE_INTEGER, - key::kMaxConnectionsPerProxy }, #if defined(OS_CHROMEOS) { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index ca1449f..d209228 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -273,9 +273,7 @@ INSTANTIATE_TEST_CASE_P( TypeAndName(kPolicyRestoreOnStartup, prefs::kRestoreOnStartup), TypeAndName(kPolicyPolicyRefreshRate, - prefs::kUserPolicyRefreshRate), - TypeAndName(kPolicyMaxConnectionsPerProxy, - prefs::kMaxConnectionsPerProxy))); + prefs::kUserPolicyRefreshRate))); // Test cases for the proxy policy settings. class ConfigurationPolicyPrefStoreProxyTest : public testing::Test { diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index 3a486cf..668492d 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -345,9 +345,6 @@ INSTANTIATE_TEST_CASE_P( key::kDisabledSchemes), PolicyTestParams::ForStringPolicy( kPolicyDiskCacheDir, - key::kDiskCacheDir), - PolicyTestParams::ForIntegerPolicy( - kPolicyMaxConnectionsPerProxy, - key::kMaxConnectionsPerProxy))); + key::kDiskCacheDir))); } // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index b2cc3ce..b14e5b5 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -503,9 +503,6 @@ INSTANTIATE_TEST_CASE_P( key::kDisabledSchemes), PolicyTestParams::ForStringPolicy( kPolicyDiskCacheDir, - key::kDiskCacheDir), - PolicyTestParams::ForIntegerPolicy( - kPolicyMaxConnectionsPerProxy, - key::kMaxConnectionsPerProxy))); + key::kDiskCacheDir))); } // namespace policy |