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/9782002

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

5 files changed, 21 insertions, 2 deletions

diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index d36f8b1..ec84f23 100644
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -12,6 +12,7 @@
 #include <string>
 
 #include "base/string_util.h"
+#include "chrome/common/net/test_server_locations.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -90,7 +91,11 @@ std::wstring ChromeFrameDistribution::GetStatsServerURL() {
 }
 
 std::string ChromeFrameDistribution::GetNetworkStatsServer() const {
-  return "chrome.googleechotest.com";
+  return chrome_common_net::kEchoTestServerLocation;
+}
+
+std::string ChromeFrameDistribution::GetHttpPipeliningTestServer() const {
+  return chrome_common_net::kPipelineTestServerBaseUrl;
 }
 
 std::wstring ChromeFrameDistribution::GetUninstallLinkName() {
diff --git a/chrome/installer/util/chrome_frame_distribution.h b/chrome/installer/util/chrome_frame_distribution.h
index cb737e9..a29f472 100644
--- a/chrome/installer/util/chrome_frame_distribution.h
+++ b/chrome/installer/util/chrome_frame_distribution.h
@@ -43,6 +43,8 @@ class ChromeFrameDistribution : public BrowserDistribution {
 
   virtual std::string GetNetworkStatsServer() const OVERRIDE;
 
+  virtual std::string GetHttpPipeliningTestServer() const OVERRIDE;
+
   virtual std::wstring GetUninstallLinkName() OVERRIDE;
 
   virtual std::wstring GetUninstallRegPath() OVERRIDE;
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 78246c2..e51e68f 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -29,6 +29,7 @@
 #include "chrome/common/attrition_experiments.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/test_server_locations.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/product.h"
@@ -498,7 +499,11 @@ std::wstring GoogleChromeDistribution::GetStatsServerURL() {
 }
 
 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
-  return "chrome.googleechotest.com";
+  return chrome_common_net::kEchoTestServerLocation;
+}
+
+std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const {
+  return chrome_common_net::kPipelineTestServerBaseUrl;
 }
 
 std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index f895382..64ed1f1 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -61,6 +61,8 @@ class GoogleChromeDistribution : public BrowserDistribution {
 
   virtual std::string GetNetworkStatsServer() const OVERRIDE;
 
+  virtual std::string GetHttpPipeliningTestServer() const OVERRIDE;
+
   // This method reads data from the Google Update ClientState key for
   // potential use in the uninstall survey. It must be called before the
   // key returned by GetVersionKey() is deleted.
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 5a3f293..592e2f2 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -86,6 +86,11 @@ std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
   return std::string();
 }
 
+std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const {
+  NOTREACHED();
+  return std::string();
+}
+
 std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
   NOTREACHED();
   return std::wstring();