Added the server names for TCP/UDP echo servers to

collect network connectivity stats.

This is enabled for 0.5% of users who are participating
in NetworkConnectivity field trial.

BUG=82565
TEST=browser tests
R=willchan

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

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

diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 90ac13e..4b6ea95 100644 (file)
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -621,8 +621,7 @@ void MetricsService::RecordBreakpadHasDebugger(bool has_debugger) {
 void MetricsService::InitializeMetricsState() {
 #if defined(OS_POSIX)
   server_url_ = L"https://clients4.google.com/firefox/metrics/collect";
-  // TODO(rtenneti): Return the network stats server name.
-  network_stats_server_ = "";
+  network_stats_server_ = "chrome.googleechotest.com";
 #else
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   server_url_ = dist->GetStatsServerURL();

diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc
index c365b06..dfdda89 100644 (file)
--- a/chrome/browser/net/network_stats.cc
+++ b/chrome/browser/net/network_stats.cc
@@ -570,11 +570,10 @@ void CollectNetworkStats(const std::string& network_stats_server,
 
   ++number_of_tests_done;
 
-  // Use SPDY's UDP port per http://www.iana.org/assignments/port-numbers.
   // |network_stats_server| echo TCP and UDP servers listen on the following
   // ports.
-  uint32 kTCPTestingPort = 8081;
-  uint32 kUDPTestingPort = 6121;
+  uint32 kTCPTestingPort = 80;
+  uint32 kUDPTestingPort = 53;
 
   net::HostResolver* host_resolver = io_thread->globals()->host_resolver.get();
   DCHECK(host_resolver);

diff --git a/chrome/installer/util/chrome_frame_distribution.cc b/chrome/installer/util/chrome_frame_distribution.cc
index f4fa099..576dc4a 100644 (file)
--- a/chrome/installer/util/chrome_frame_distribution.cc
+++ b/chrome/installer/util/chrome_frame_distribution.cc
@@ -90,8 +90,7 @@ std::wstring ChromeFrameDistribution::GetStatsServerURL() {
 }
 
 std::string ChromeFrameDistribution::GetNetworkStatsServer() const {
-  // TODO(rtenneti): Return the network stats server name.
-  return "";
+  return "chrome.googleechotest.com";
 }
 
 std::wstring ChromeFrameDistribution::GetUninstallLinkName() {

diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 7a0e89d..974bba5 100644 (file)
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -461,8 +461,7 @@ std::wstring GoogleChromeDistribution::GetStatsServerURL() {
 }
 
 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
-  // TODO(rtenneti): Return the network stats server name.
-  return "";
+  return "chrome.googleechotest.com";
 }
 
 std::wstring GoogleChromeDistribution::GetDistributionData(HKEY root_key) {