NetConnectivity - Collect stats for TCP/UDP network

chrome/browser/net/network_stats_unittest.cc

Index: chrome/browser/net/network_stats_unittest.cc
===================================================================
--- chrome/browser/net/network_stats_unittest.cc	(revision 132599)
+++ chrome/browser/net/network_stats_unittest.cc	(working copy)
@@ -48,6 +48,7 @@
     EXPECT_TRUE(udp_stats_client->Start(host_resolver.get(),
                                         test_server_.host_port_pair(),
                                         NetworkStats::HISTOGRAM_PORT_MAX,
+                                        true,
                                         bytes,
                                         cb.callback()));
     int rv = cb.WaitForResult();
@@ -79,6 +80,7 @@
     EXPECT_TRUE(tcp_stats_client->Start(host_resolver.get(),
                                         test_server_.host_port_pair(),
                                         NetworkStats::HISTOGRAM_PORT_MAX,
+                                        true,
                                         bytes,
                                         cb.callback()));
     int rv = cb.WaitForResult();
@@ -115,6 +117,7 @@
   net::TestCompletionCallback cb;
   network_stats.Initialize(KBytesToSend,
                            NetworkStats::HISTOGRAM_PORT_MAX,
+                           true,
                            cb.callback());
 
   std::string message;
@@ -199,29 +202,72 @@
 }
 
 TEST_F(NetworkStatsTest, GetHistogramNames) {
-  // Test TCP, large packet, success histogram name.
+  // Test TCP, large packet, success histogram name, without proxy server.
   std::string rtt_histogram_name;
+  std::string rtt_no_proxy_histogram_name;
   std::string status_histogram_name;
+  std::string status_no_proxy_histogram_name;
   NetworkStats::GetHistogramNames(NetworkStats::PROTOCOL_TCP,
                                   NetworkStats::PORT_53,
+                                  true,
                                   1024,
                                   net::OK,
                                   &rtt_histogram_name,
-                                  &status_histogram_name);
+                                  &rtt_no_proxy_histogram_name,
+                                  &status_histogram_name,
+                                  &status_no_proxy_histogram_name);
   EXPECT_EQ("NetConnectivity.TCP.Success.53.1K.RTT", rtt_histogram_name);
+  EXPECT_EQ("NetConnectivity.TCP.NoProxy.Success.53.1K.RTT",
+            rtt_no_proxy_histogram_name);
   EXPECT_EQ("NetConnectivity.TCP.Status.53.1K", status_histogram_name);
+  EXPECT_EQ("NetConnectivity.TCP.NoProxy.Status.53.1K",
+            status_no_proxy_histogram_name);
 
-  // Test UDP, small packet, failure histogram name.
-  std::string rtt_histogram_name1;
-  std::string status_histogram_name1;
+  // Test TCP, large packet, success histogram name, with proxy server.
+  NetworkStats::GetHistogramNames(NetworkStats::PROTOCOL_TCP,
+                                  NetworkStats::PORT_53,
+                                  false,
+                                  1024,
+                                  net::OK,
+                                  &rtt_histogram_name,
+                                  &rtt_no_proxy_histogram_name,
+                                  &status_histogram_name,
+                                  &status_no_proxy_histogram_name);
+  EXPECT_EQ("NetConnectivity.TCP.Success.53.1K.RTT", rtt_histogram_name);
+  EXPECT_EQ("", rtt_no_proxy_histogram_name);
+  EXPECT_EQ("NetConnectivity.TCP.Status.53.1K", status_histogram_name);
+  EXPECT_EQ("", status_no_proxy_histogram_name);
+
+  // Test UDP, small packet, failure histogram name, without proxy server.
   NetworkStats::GetHistogramNames(NetworkStats::PROTOCOL_UDP,
                                   NetworkStats::PORT_6121,
+                                  true,
                                   100,
                                   net::ERR_INVALID_ARGUMENT,
-                                  &rtt_histogram_name1,
-                                  &status_histogram_name1);
-  EXPECT_EQ("", rtt_histogram_name1);
-  EXPECT_EQ("NetConnectivity.UDP.Status.6121.100B", status_histogram_name1);
+                                  &rtt_histogram_name,
+                                  &rtt_no_proxy_histogram_name,
+                                  &status_histogram_name,
+                                  &status_no_proxy_histogram_name);
+  EXPECT_EQ("", rtt_histogram_name);
+  EXPECT_EQ("", rtt_no_proxy_histogram_name);
+  EXPECT_EQ("NetConnectivity.UDP.Status.6121.100B", status_histogram_name);
+  EXPECT_EQ("NetConnectivity.UDP.NoProxy.Status.6121.100B",
+            status_no_proxy_histogram_name);
+
+  // Test UDP, small packet, failure histogram name, with proxy server.
+  NetworkStats::GetHistogramNames(NetworkStats::PROTOCOL_UDP,
+                                  NetworkStats::PORT_6121,
+                                  false,
+                                  100,
+                                  net::ERR_INVALID_ARGUMENT,
+                                  &rtt_histogram_name,
+                                  &rtt_no_proxy_histogram_name,
+                                  &status_histogram_name,
+                                  &status_no_proxy_histogram_name);
+  EXPECT_EQ("", rtt_histogram_name);
+  EXPECT_EQ("", rtt_no_proxy_histogram_name);
+  EXPECT_EQ("NetConnectivity.UDP.Status.6121.100B", status_histogram_name);
+  EXPECT_EQ("", status_no_proxy_histogram_name);
 }
 
 }  // namespace chrome_browser_net