summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-27 03:50:47 +0000
committerstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-27 03:50:47 +0000
commit0059278be6576537a16702ffadd202862868ae48 (patch)
treeb2a10259904b3d03520bcfd1d6c96b3dea5057f8
parentbc311a14ba48a0dfffcd8c71420f91c2bf9445ee (diff)
downloadchromium_src-0059278be6576537a16702ffadd202862868ae48.zip
chromium_src-0059278be6576537a16702ffadd202862868ae48.tar.gz
chromium_src-0059278be6576537a16702ffadd202862868ae48.tar.bz2
Remove the IdleSktToImpact field trial.
BUG=156873 TBR=sky Review URL: https://chromiumcodereview.appspot.com/11311004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164504 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chrome_browser_field_trials.cc44
-rw-r--r--chrome/renderer/page_load_histograms.cc33
2 files changed, 0 insertions, 77 deletions
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index e59ee9a..ad48ae3 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -105,7 +105,6 @@ ChromeBrowserFieldTrials::~ChromeBrowserFieldTrials() {
}
void ChromeBrowserFieldTrials::SetupFieldTrials(bool proxy_policy_is_set) {
- SocketTimeoutFieldTrial();
prerender::ConfigurePrefetchAndPrerender(parsed_command_line_);
SpdyFieldTrial();
WarmConnectionFieldTrial();
@@ -123,49 +122,6 @@ void ChromeBrowserFieldTrials::SetupFieldTrials(bool proxy_policy_is_set) {
#endif
}
-// A/B test for determining a value for unused socket timeout. Currently the
-// timeout defaults to 10 seconds. Having this value set too low won't allow us
-// to take advantage of idle sockets. Setting it to too high could possibly
-// result in more ERR_CONNECTION_RESETs, since some servers will kill a socket
-// before we time it out. Since these are "unused" sockets, we won't retry the
-// connection and instead show an error to the user. So we need to be
-// conservative here. We've seen that some servers will close the socket after
-// as short as 10 seconds. See http://crbug.com/84313 for more details.
-void ChromeBrowserFieldTrials::SocketTimeoutFieldTrial() {
- const base::FieldTrial::Probability kIdleSocketTimeoutDivisor = 100;
- // 1% probability for all experimental settings.
- const base::FieldTrial::Probability kSocketTimeoutProbability = 1;
-
- // After June 30, 2011 builds, it will always be in default group.
- int socket_timeout_10 = -1;
- scoped_refptr<base::FieldTrial> socket_timeout_trial(
- base::FieldTrialList::FactoryGetFieldTrial(
- "IdleSktToImpact", kIdleSocketTimeoutDivisor, "idle_timeout_10",
- 2011, 6, 30, &socket_timeout_10));
-
- const int socket_timeout_5 =
- socket_timeout_trial->AppendGroup("idle_timeout_5",
- kSocketTimeoutProbability);
- const int socket_timeout_20 =
- socket_timeout_trial->AppendGroup("idle_timeout_20",
- kSocketTimeoutProbability);
-
- const int idle_to_trial_group = socket_timeout_trial->group();
-
- if (idle_to_trial_group == socket_timeout_5) {
- net::ClientSocketPool::set_unused_idle_socket_timeout(
- base::TimeDelta::FromSeconds(5));
- } else if (idle_to_trial_group == socket_timeout_10) {
- net::ClientSocketPool::set_unused_idle_socket_timeout(
- base::TimeDelta::FromSeconds(10));
- } else if (idle_to_trial_group == socket_timeout_20) {
- net::ClientSocketPool::set_unused_idle_socket_timeout(
- base::TimeDelta::FromSeconds(20));
- } else {
- NOTREACHED();
- }
-}
-
// When --use-spdy not set, users will be in A/B test for spdy.
// group A (npn_with_spdy): this means npn and spdy are enabled. In case server
// supports spdy, browser will use spdy.
diff --git a/chrome/renderer/page_load_histograms.cc b/chrome/renderer/page_load_histograms.cc
index bb53ac8..6f5fbdc 100644
--- a/chrome/renderer/page_load_histograms.cc
+++ b/chrome/renderer/page_load_histograms.cc
@@ -423,39 +423,6 @@ void PageLoadHistograms::Dump(WebFrame* frame) {
begin_to_finish_all_loads);
}
- // Histograms to determine effect of idle socket timeout.
- static const bool use_idle_socket_timeout_histogram =
- base::FieldTrialList::TrialExists("IdleSktToImpact");
- if (use_idle_socket_timeout_histogram) {
- UMA_HISTOGRAM_ENUMERATION(
- base::FieldTrial::MakeName("PLT.Abandoned", "IdleSktToImpact"),
- abandoned_page ? 1 : 0, 2);
- switch (load_type) {
- case DocumentState::NORMAL_LOAD:
- PLT_HISTOGRAM(base::FieldTrial::MakeName(
- "PLT.BeginToFinish_NormalLoad", "IdleSktToImpact"),
- begin_to_finish_all_loads);
- break;
- case DocumentState::LINK_LOAD_NORMAL:
- PLT_HISTOGRAM(base::FieldTrial::MakeName(
- "PLT.BeginToFinish_LinkLoadNormal", "IdleSktToImpact"),
- begin_to_finish_all_loads);
- break;
- case DocumentState::LINK_LOAD_RELOAD:
- PLT_HISTOGRAM(base::FieldTrial::MakeName(
- "PLT.BeginToFinish_LinkLoadReload", "IdleSktToImpact"),
- begin_to_finish_all_loads);
- break;
- case DocumentState::LINK_LOAD_CACHE_STALE_OK:
- PLT_HISTOGRAM(base::FieldTrial::MakeName(
- "PLT.BeginToFinish_LinkLoadStaleOk", "IdleSktToImpact"),
- begin_to_finish_all_loads);
- break;
- default:
- break;
- }
- }
-
// Histograms to determine if SDCH has an impact.
// TODO(jar): Consider removing per-link load types and the enumeration.
static const bool use_sdch_histogram =