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 b1ffdebaeb58e378ad6806ba6c2028f26ae2a33a..879fc2be00e18f4ffb9bb2e0026a38a744cc412e 100644 |
--- a/net/base/network_quality_estimator_unittest.cc |
+++ b/net/base/network_quality_estimator_unittest.cc |
@@ -224,18 +224,22 @@ TEST(NetworkQualityEstimatorTest, PercentileSameTimestamps) { |
// samples. This helps in verifying that the order of samples does not matter. |
for (int i = 1; i <= 99; i += 2) { |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
EXPECT_TRUE(estimator.GetRTTEstimate(&rtt)); |
EXPECT_TRUE(estimator.GetDownlinkThroughputKbpsEstimate(&kbps)); |
} |
for (int i = 2; i <= 100; i += 2) { |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
EXPECT_TRUE(estimator.GetRTTEstimate(&rtt)); |
EXPECT_TRUE(estimator.GetDownlinkThroughputKbpsEstimate(&kbps)); |
} |
@@ -276,17 +280,23 @@ TEST(NetworkQualityEstimatorTest, PercentileDifferentTimestamps) { |
// First 50 samples have very old timestamp. |
for (int i = 1; i <= 50; ++i) { |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, very_old)); |
+ NetworkQualityEstimator::Observation( |
+ i, very_old, |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, very_old)); |
+ NetworkQualityEstimator::Observation( |
+ i, very_old, |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
} |
// Next 50 (i.e., from 51 to 100) have recent timestamp. |
for (int i = 51; i <= 100; ++i) { |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(i, now)); |
+ NetworkQualityEstimator::Observation( |
+ i, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
} |
// Older samples have very little weight. So, all percentiles are >= 51 |
@@ -495,9 +505,13 @@ TEST(NetworkQualityEstimatorTest, TestCaching) { |
// Cache entry will not be added for (NONE, ""). |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 1, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1000, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 1000, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.SimulateNetworkChangeTo( |
NetworkChangeNotifier::ConnectionType::CONNECTION_2G, "test-1"); |
EXPECT_EQ(expected_cache_size, estimator.cached_network_qualities_.size()); |
@@ -506,9 +520,13 @@ TEST(NetworkQualityEstimatorTest, TestCaching) { |
// Also, set the network quality for (2G, "test1") so that it is stored in |
// the cache. |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 1, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1000, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 1000, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.SimulateNetworkChangeTo( |
NetworkChangeNotifier::ConnectionType::CONNECTION_3G, "test-1"); |
@@ -519,9 +537,13 @@ TEST(NetworkQualityEstimatorTest, TestCaching) { |
// Also, set the network quality for (3G, "test1") so that it is stored in |
// the cache. |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(2, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 2, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(500, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 500, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.SimulateNetworkChangeTo( |
NetworkChangeNotifier::ConnectionType::CONNECTION_3G, "test-2"); |
++expected_cache_size; |
@@ -585,9 +607,13 @@ TEST(NetworkQualityEstimatorTest, TestLRUCacheMaximumSize) { |
base::TimeTicks update_time_of_network_100; |
for (size_t i = 0; i < network_count; ++i) { |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(2, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 2, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(500, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 500, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
if (i == 100) |
update_time_of_network_100 = base::TimeTicks::Now(); |
@@ -603,9 +629,13 @@ TEST(NetworkQualityEstimatorTest, TestLRUCacheMaximumSize) { |
} |
// One more call so that the last network is also written to cache. |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(2, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 2, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(500, base::TimeTicks::Now())); |
+ NetworkQualityEstimator::Observation( |
+ 500, base::TimeTicks::Now(), |
+ NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.SimulateNetworkChangeTo( |
net::NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI, |
base::IntToString(network_count - 1)); |
@@ -631,14 +661,18 @@ TEST(NetworkQualityEstimatorTest, TestGetMedianRTTSince) { |
// First sample has very old timestamp. |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1, old)); |
+ NetworkQualityEstimator::Observation( |
+ 1, old, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(1, old)); |
+ NetworkQualityEstimator::Observation( |
+ 1, old, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.downstream_throughput_kbps_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(100, now)); |
+ NetworkQualityEstimator::Observation( |
+ 100, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
estimator.rtt_msec_observations_.AddObservation( |
- NetworkQualityEstimator::Observation(100, now)); |
+ NetworkQualityEstimator::Observation( |
+ 100, now, NetworkQualityEstimator::OBSERVATION_SOURCE_URL_REQUEST)); |
base::TimeDelta rtt; |
EXPECT_FALSE(estimator.GetRecentMedianRTT( |