Store network quality samples so we can compute percentiles.

net/base/network_quality_estimator_unittest.cc

Index: net/base/network_quality_estimator_unittest.cc
diff --git a/net/base/network_quality_estimator_unittest.cc b/net/base/network_quality_estimator_unittest.cc
index 5ec81ab440f4055e4b83d3b283343382c4c5e34f..171b2111764b96835c06d4262c9b6e198315889d 100644
--- a/net/base/network_quality_estimator_unittest.cc
+++ b/net/base/network_quality_estimator_unittest.cc
@@ -33,9 +33,9 @@ TEST(NetworkQualityEstimatorTest, DISABLED_TestPeakKbpsFastestRTTUpdates) {
   // Enable requests to local host to be used for network quality estimation.
   NetworkQualityEstimator estimator(true);
   {
-    NetworkQuality network_quality = estimator.GetEstimate();
-    EXPECT_EQ(network_quality.fastest_rtt_confidence, 0);
-    EXPECT_EQ(network_quality.peak_throughput_kbps_confidence, 0);
+    NetworkQuality network_quality = estimator.GetPeakEstimate();
+    EXPECT_EQ(network_quality.rtt_confidence, 0);
+    EXPECT_EQ(network_quality.throughput_kbps_confidence, 0);
   }
 
   TestDelegate d;
@@ -56,25 +56,26 @@ TEST(NetworkQualityEstimatorTest, DISABLED_TestPeakKbpsFastestRTTUpdates) {
 
   // With smaller transfer, |fastest_rtt| will be updated but not
   // |peak_throughput_kbps|.
-  estimator.NotifyDataReceived(*(request.get()),
+  estimator.NotifyDataReceived(*(request.get()), min_transfer_size_in_bytes - 1,
                                min_transfer_size_in_bytes - 1);
   {
-    NetworkQuality network_quality = estimator.GetEstimate();
-    EXPECT_GT(network_quality.fastest_rtt_confidence, 0);
-    EXPECT_EQ(network_quality.peak_throughput_kbps_confidence, 0);
+    NetworkQuality network_quality = estimator.GetPeakEstimate();
+    EXPECT_GT(network_quality.rtt_confidence, 0);
+    EXPECT_EQ(network_quality.throughput_kbps_confidence, 0);
   }
 
   // With large transfer, both |fastest_rtt| and |peak_throughput_kbps| will be
   // updated.
-  estimator.NotifyDataReceived(*(request.get()), min_transfer_size_in_bytes);
+  estimator.NotifyDataReceived(*(request.get()), min_transfer_size_in_bytes,
+                               min_transfer_size_in_bytes);
   {
-    NetworkQuality network_quality = estimator.GetEstimate();
-    EXPECT_GT(network_quality.fastest_rtt_confidence, 0);
-    EXPECT_GT(network_quality.peak_throughput_kbps_confidence, 0);
-    EXPECT_GE(network_quality.fastest_rtt, request_duration);
-    EXPECT_GT(network_quality.peak_throughput_kbps, uint32(0));
+    NetworkQuality network_quality = estimator.GetPeakEstimate();
+    EXPECT_GT(network_quality.rtt_confidence, 0);
+    EXPECT_GT(network_quality.throughput_kbps_confidence, 0);
+    EXPECT_GE(network_quality.rtt, request_duration);
+    EXPECT_GT(network_quality.throughput_kbps, uint32(0));
     EXPECT_LE(
-        network_quality.peak_throughput_kbps,
+        network_quality.throughput_kbps,
         min_transfer_size_in_bytes * 8.0 / request_duration.InMilliseconds());
   }
   EXPECT_EQ(estimator.bytes_read_since_last_connection_change_, true);
@@ -89,11 +90,11 @@ TEST(NetworkQualityEstimatorTest, DISABLED_TestPeakKbpsFastestRTTUpdates) {
   histogram_tester.ExpectTotalCount("NQE.PeakKbps.Unknown", 1);
   histogram_tester.ExpectTotalCount("NQE.FastestRTT.Unknown", 1);
   {
-    NetworkQuality network_quality = estimator.GetEstimate();
+    NetworkQuality network_quality = estimator.GetPeakEstimate();
     EXPECT_EQ(estimator.current_connection_type_,
               NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI);
-    EXPECT_EQ(network_quality.fastest_rtt_confidence, 0);
-    EXPECT_EQ(network_quality.peak_throughput_kbps_confidence, 0);
+    EXPECT_EQ(network_quality.rtt_confidence, 0);
+    EXPECT_EQ(network_quality.throughput_kbps_confidence, 0);
   }
 }
 #endif  // !defined(OS_IOS)