NetConnectivity - Collect stats for TCP/UDP network

chrome/browser/net/network_stats_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/net/network_stats.h"
 #include "net/base/host_resolver.h"
 #include "net/base/mock_host_resolver.h"
@@ skipping 30 matching lines @@
 
     scoped_ptr<net::MockHostResolver> host_resolver(
         new net::MockHostResolver());
 
     // We will use HISTOGRAM_PORT_MAX as the PortIndex enum for testing
     // purposes.
     UDPStatsClient* udp_stats_client = new UDPStatsClient();
     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();
     // Check there were no errors during connect/write/read to echo UDP server.
     EXPECT_EQ(0, rv);
   }
 
   net::TestServer test_server_;
 };
 
@@ skipping 11 matching lines @@
 
     scoped_ptr<net::MockHostResolver> host_resolver(
         new net::MockHostResolver());
 
     // We will use HISTOGRAM_PORT_MAX as the PortIndex enum for testing
     // purposes.
     TCPStatsClient* tcp_stats_client = new TCPStatsClient();
     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();
     // Check there were no errors during connect/write/read to echo TCP server.
     EXPECT_EQ(0, rv);
   }
 
   net::TestServer test_server_;
 };
 
@@ skipping 16 matching lines @@
   ASSERT_TRUE(test_server_.Start());
   RunTCPEchoTest(1024);
 }
 
 TEST_F(NetworkStatsTestTCP, VerifyBytes) {
   static const uint32 KBytesToSend = 100;
   TCPStatsClient network_stats;
   net::TestCompletionCallback cb;
   network_stats.Initialize(KBytesToSend,
                            NetworkStats::HISTOGRAM_PORT_MAX,
+                           true,
                            cb.callback());
 
   std::string message;
   network_stats.set_encoded_message(message);
   EXPECT_EQ(NetworkStats::ZERO_LENGTH_ERROR, network_stats.VerifyBytes());
 
   std::string version = base::StringPrintf("%02d", 1);
   std::string invalid_checksum = base::StringPrintf("%010d", 0);
   std::string payload_size = base::StringPrintf("%07d", KBytesToSend);
   std::string invalid_key = base::StringPrintf("%06d", -1);
@@ skipping 64 matching lines @@
       pattern_changed_payload;
   network_stats.set_encoded_message(message);
   EXPECT_EQ(NetworkStats::PATTERN_CHANGED, network_stats.VerifyBytes());
 
   message = version + checksum + payload_size + key_string + payload;
   network_stats.set_encoded_message(message);
   EXPECT_EQ(NetworkStats::SUCCESS, network_stats.VerifyBytes());
 }
 
 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