For packet pacing and non-paced network connectivity tests, collect

chrome/browser/net/network_stats.cc

Index: chrome/browser/net/network_stats.cc
===================================================================
--- chrome/browser/net/network_stats.cc	(revision 156731)
+++ chrome/browser/net/network_stats.cc	(working copy)
@@ -689,11 +689,9 @@
 
   std::string load_size_string = base::StringPrintf("%dB", load_size_);
 
-  if (packets_to_send_ == kMaximumCorrelationPackets) {
-    RecordPacketLossSeriesHistograms(
-        protocol, load_size_string, status, result);
+  RecordPacketLossSeriesHistograms(protocol, load_size_string, status, result);
+  if (packets_to_send_ == kMaximumCorrelationPackets)
     return;

[jar (doing other things), 2012/09/14 22:34:54]

No longer needed.

[ramant (doing other things), 2012/09/14 23:39:08]

Done.

-  }
 
   for (uint32 i = 0; i < 3; i++)
     RecordRTTHistograms(protocol, load_size_string, i);
@@ -778,8 +776,6 @@
     const std::string& load_size_string,
     const Status& status,
     int result) {
-  DCHECK_EQ(packets_to_send_, kMaximumCorrelationPackets);
-
   const char* test_name = TestName();
 
   // Build "NetConnectivity3.Send6.SeriesAcked.<port>.<load_size>" histogram
@@ -797,6 +793,9 @@
       kPorts[histogram_port_],
       load_size_string.c_str());
 
+  uint32 six_packets_received_mask =

[jar (doing other things), 2012/09/14 22:34:54]

nit: suggest correlated_packet_mask

This way, the size is held in the kMaximumCorrelationPackets only.

[ramant (doing other things), 2012/09/14 23:39:08]

Done.

+    ((1 << kMaximumCorrelationPackets) - 1) & packets_received_mask_;
+
   // If we are running without a proxy, we'll generate 2 distinct histograms in
   // each case, one will have the ".NoProxy" suffix.
   size_t histogram_count = has_proxy_server_ ? 1 : 2;
@@ -808,7 +807,7 @@
         2 << kMaximumCorrelationPackets,

[jar (doing other things), 2012/09/14 22:34:54]

I think this and the next line can use (with plus 1 on next line):

1 << kMaximumCorrelationPackets

It will shrink the histograms.... but you weren't using the high end ones.

[ramant (doing other things), 2012/09/14 23:39:08]

Done.

         (2 << kMaximumCorrelationPackets) + 1,
         base::Histogram::kUmaTargetedHistogramFlag);
-    series_acked_histogram->Add(packets_received_mask_);
+    series_acked_histogram->Add(six_packets_received_mask);
     series_acked_histogram_name.append(".NoProxy");
 
     base::Histogram* packets_sent_histogram =