Remove throttling trial, and make feature on by default.

BUG=83775
TEST=manual, plus existing unit tests

Review URL: http://codereview.chromium.org/7748039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99173 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 31 deletions

diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc
index a56e414..3c608c0 100644
--- a/net/url_request/url_request_throttler_entry.cc
+++ b/net/url_request/url_request_throttler_entry.cc
@@ -201,11 +201,6 @@ bool URLRequestThrottlerEntry::ShouldRejectRequest(int load_flags) const {
   int reject_count = reject_request ? 1 : 0;
   UMA_HISTOGRAM_ENUMERATION(
       "Throttling.RequestThrottled", reject_count, 2);
-  if (base::FieldTrialList::TrialExists("HttpThrottlingEnabled")) {
-    UMA_HISTOGRAM_ENUMERATION(base::FieldTrial::MakeName(
-        "Throttling.RequestThrottled", "HttpThrottlingEnabled"),
-        reject_count, 2);
-  }
 
   return reject_request;
 }
@@ -370,12 +365,6 @@ void URLRequestThrottlerEntry::HandleCustomRetryAfter(
   UMA_HISTOGRAM_CUSTOM_TIMES(
       "Throttling.CustomRetryAfterMs", value,
       base::TimeDelta::FromSeconds(1), base::TimeDelta::FromHours(12), 50);
-  if (base::FieldTrialList::TrialExists("HttpThrottlingEnabled")) {
-    UMA_HISTOGRAM_CUSTOM_TIMES(
-        base::FieldTrial::MakeName("Throttling.CustomRetryAfterMs",
-                                   "HttpThrottlingEnabled"), value,
-        base::TimeDelta::FromSeconds(1), base::TimeDelta::FromHours(12), 50);
-  }
 }
 
 void URLRequestThrottlerEntry::HandleThrottlingHeader(
@@ -396,12 +385,6 @@ void URLRequestThrottlerEntry::HandleMetricsTracking(int response_code) {
   // to make sure we count only the responses seen by throttling.
   // TODO(joi): Remove after experiment.
   UMA_HISTOGRAM_ENUMERATION("Throttling.HttpResponseCode", response_code, 600);
-  if (base::FieldTrialList::TrialExists("HttpThrottlingEnabled")) {
-    UMA_HISTOGRAM_ENUMERATION(
-        base::FieldTrial::MakeName("Throttling.HttpResponseCode",
-                                   "HttpThrottlingEnabled"),
-        response_code, 600);
-  }
 
   // Note that we are not interested in whether the code is considered
   // an error for the backoff logic, but whether it is a 5xx error in
@@ -421,16 +404,6 @@ void URLRequestThrottlerEntry::HandleMetricsTracking(int response_code) {
           "Throttling.PerceivedDowntime", down_time,
           base::TimeDelta::FromMilliseconds(10),
           base::TimeDelta::FromHours(6), 50);
-
-      if (base::FieldTrialList::TrialExists("HttpThrottlingEnabled")) {
-        UMA_HISTOGRAM_COUNTS(base::FieldTrial::MakeName(
-            "Throttling.FailureCountAtSuccess", "HttpThrottlingEnabled"),
-            failure_count);
-        UMA_HISTOGRAM_CUSTOM_TIMES(base::FieldTrial::MakeName(
-            "Throttling.PerceivedDowntime", "HttpThrottlingEnabled"), down_time,
-            base::TimeDelta::FromMilliseconds(10),
-            base::TimeDelta::FromHours(6), 50);
-      }
     }
 
     last_successful_response_time_ = now;
diff --git a/net/url_request/url_request_throttler_manager.cc b/net/url_request/url_request_throttler_manager.cc
index 1bbad1f..8e634e8 100644
--- a/net/url_request/url_request_throttler_manager.cc
+++ b/net/url_request/url_request_throttler_manager.cc
@@ -89,10 +89,6 @@ void URLRequestThrottlerManager::AddToOptOutList(const std::string& host) {
   // In practice, this would almost never occur.
   if (opt_out_hosts_.find(host) == opt_out_hosts_.end()) {
     UMA_HISTOGRAM_COUNTS("Throttling.SiteOptedOut", 1);
-    if (base::FieldTrialList::TrialExists("HttpThrottlingEnabled")) {
-      UMA_HISTOGRAM_COUNTS(base::FieldTrial::MakeName(
-          "Throttling.SiteOptedOut", "HttpThrottlingEnabled"), 1);
-    }
 
     net_log_->EndEvent(
         NetLog::TYPE_THROTTLING_DISABLED_FOR_HOST,