Revert 127579 - Launch HTTP pipelining compatibility field trial for 1% of canary users.

BUG=110794
TEST=Built official Chrome and let it run


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

TBR=simonjam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9727013

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

2 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index e99fa4c..fa74ce3 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -220,9 +220,6 @@ const char kServerUrlXml[] =
     "https://clients4.google.com/firefox/metrics/collect";
 const char kServerUrlProto[] = "https://clients4.google.com/uma/v2";
 
-const char kEchoTestServer[] = "chrome.googleechotest.com";
-const char kPipelineTestServer[] = "http://70.32.157.92/";
-
 // The delay, in seconds, after starting recording before doing expensive
 // initialization work.
 const int kInitializationDelaySeconds = 30;
@@ -654,8 +651,9 @@ void MetricsService::InitializeMetricsState() {
 #if defined(OS_POSIX)
   server_url_xml_ = ASCIIToUTF16(kServerUrlXml);
   server_url_proto_ = ASCIIToUTF16(kServerUrlProto);
-  network_stats_server_ = kEchoTestServer;
-  http_pipelining_test_server_ = kPipelineTestServer;
+  network_stats_server_ = "chrome.googleechotest.com";
+  // TODO(simonjam): Figure out where this will be hosted.
+  http_pipelining_test_server_ = "";
 #else
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   server_url_xml_ = dist->GetStatsServerURL();
diff --git a/chrome/browser/net/http_pipelining_compatibility_client.cc b/chrome/browser/net/http_pipelining_compatibility_client.cc
index e3581e2..5366097 100644
--- a/chrome/browser/net/http_pipelining_compatibility_client.cc
+++ b/chrome/browser/net/http_pipelining_compatibility_client.cc
@@ -298,24 +298,25 @@ void CollectPipeliningCapabilityStatsOnIOThread(
   }
 
   const base::FieldTrial::Probability kDivisor = 100;
-  base::FieldTrial::Probability probability_to_run_test = 0;
+  base::FieldTrial::Probability probability_per_group = 0;
 
   const char* kTrialName = "HttpPipeliningCompatibility";
   base::FieldTrial* trial = base::FieldTrialList::Find(kTrialName);
   if (trial) {
     return;
   }
-  // After April 1, 2012, the trial will disable itself.
+  // After October 30, 2012 builds, it will always be in default group
+  // (disable_network_stats).
   trial = new base::FieldTrial(kTrialName, kDivisor,
-                               "disable_test", 2012, 4, 1);
+                               "disable_test", 2012, 10, 30);
 
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_CANARY) {
-    probability_to_run_test = 1;
+    // TODO(simonjam): Enable this: probability_per_group = 1;
   }
 
   int collect_stats_group = trial->AppendGroup("enable_test",
-                                               probability_to_run_test);
+                                               probability_per_group);
   if (trial->group() != collect_stats_group) {
     return;
   }