diff options
| author | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 00:00:07 +0000 |
|---|---|---|
| committer | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 00:00:07 +0000 |
| commit | 75c3460508756c1e28ebd485828649c7ebb2e9e9 (patch) | |
| tree | 0965086eac8b1195013434778c3560e891492dbe /chrome/installer | |
| parent | bbd0d4c01c9273b748862e804ab71463436651bb (diff) | |
| download | chromium_src-75c3460508756c1e28ebd485828649c7ebb2e9e9.zip chromium_src-75c3460508756c1e28ebd485828649c7ebb2e9e9.tar.gz chromium_src-75c3460508756c1e28ebd485828649c7ebb2e9e9.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
5 files changed, 17 insertions, 0 deletions
diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc index d36f8b1..f8c0d1e 100644 --- a/chrome/installer/util/chrome_frame_distribution.cc +++ b/chrome/installer/util/chrome_frame_distribution.cc @@ -93,6 +93,10 @@ std::string ChromeFrameDistribution::GetNetworkStatsServer() const { return "chrome.googleechotest.com"; } +std::string ChromeFrameDistribution::GetHttpPipeliningTestServer() const { + return "http://70.32.157.92/"; +} + std::wstring ChromeFrameDistribution::GetUninstallLinkName() { return L"Uninstall Chrome Frame"; } 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..e721c12 100644 --- a/chrome/installer/util/google_chrome_distribution.cc +++ b/chrome/installer/util/google_chrome_distribution.cc @@ -501,6 +501,10 @@ std::string GoogleChromeDistribution::GetNetworkStatsServer() const { return "chrome.googleechotest.com"; } +std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const { + return "http://70.32.157.92/"; +} + std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) { std::wstring sub_key(google_update::kRegPathClientState); sub_key.append(L"\\"); 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(); |