| Index: net/nqe/network_quality_estimator.h
|
| diff --git a/net/nqe/network_quality_estimator.h b/net/nqe/network_quality_estimator.h
|
| index 02d1c2cd6d3dfcd1580cb4c2a62755345f9fb8c9..b68636a32525687261cc8d298c5a8beefbbf101f 100644
|
| --- a/net/nqe/network_quality_estimator.h
|
| +++ b/net/nqe/network_quality_estimator.h
|
| @@ -111,9 +111,10 @@ class NET_EXPORT NetworkQualityEstimator
|
| base::TimeDelta transport_rtt,
|
| int32_t downstream_throughput_kbps) = 0;
|
|
|
| + virtual ~RTTAndThroughputEstimatesObserver() {}
|
| +
|
| protected:
|
| RTTAndThroughputEstimatesObserver() {}
|
| - virtual ~RTTAndThroughputEstimatesObserver() {}
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(RTTAndThroughputEstimatesObserver);
|
| @@ -446,6 +447,10 @@ class NET_EXPORT NetworkQualityEstimator
|
| const base::TimeTicks& start_time,
|
| int percentile) const;
|
|
|
| + // Observer list for RTT or throughput estimates. Protected for testing.
|
| + base::ObserverList<RTTAndThroughputEstimatesObserver>
|
| + rtt_and_throughput_estimates_observer_list_;
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(NetworkQualityEstimatorTest,
|
| AdaptiveRecomputationEffectiveConnectionType);
|
| @@ -743,10 +748,6 @@ class NET_EXPORT NetworkQualityEstimator
|
| base::ObserverList<EffectiveConnectionTypeObserver>
|
| effective_connection_type_observer_list_;
|
|
|
| - // Observer list for RTT or throughput estimates.
|
| - base::ObserverList<RTTAndThroughputEstimatesObserver>
|
| - rtt_and_throughput_estimates_observer_list_;
|
| -
|
| // Observer lists for round trip times and throughput measurements.
|
| base::ObserverList<RTTObserver> rtt_observer_list_;
|
| base::ObserverList<ThroughputObserver> throughput_observer_list_;
|
|
|