diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/net/nqe/network_quality_estimator_test_util.cc | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/nqe/network_quality_estimator_test_util.cc')
| -rw-r--r-- | chromium/net/nqe/network_quality_estimator_test_util.cc | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/chromium/net/nqe/network_quality_estimator_test_util.cc b/chromium/net/nqe/network_quality_estimator_test_util.cc index 051b68107d8..84cc8569e44 100644 --- a/chromium/net/nqe/network_quality_estimator_test_util.cc +++ b/chromium/net/nqe/network_quality_estimator_test_util.cc @@ -10,6 +10,7 @@ #include "net/base/load_flags.h" #include "net/log/net_log_with_source.h" #include "net/log/test_net_log_entry.h" +#include "net/nqe/network_quality_estimator_params.h" #include "net/test/embedded_test_server/http_response.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "net/url_request/url_request.h" @@ -66,12 +67,14 @@ TestNetworkQualityEstimator::TestNetworkQualityEstimator( bool add_default_platform_observations, bool suppress_notifications_for_testing, std::unique_ptr<BoundTestNetLog> net_log) - : NetworkQualityEstimator(std::move(external_estimate_provider), - variation_params, - allow_local_host_requests_for_tests, - allow_smaller_responses_for_tests, - add_default_platform_observations, - net_log->bound()), + : NetworkQualityEstimator( + std::move(external_estimate_provider), + base::MakeUnique<NetworkQualityEstimatorParams>(variation_params), + allow_local_host_requests_for_tests, + allow_smaller_responses_for_tests, + add_default_platform_observations, + net_log->bound()), + current_network_type_(NetworkChangeNotifier::CONNECTION_UNKNOWN), accuracy_recording_intervals_set_(false), rand_double_(0.0), @@ -180,6 +183,13 @@ bool TestNetworkQualityEstimator::GetRecentTransportRTT( return NetworkQualityEstimator::GetRecentTransportRTT(start_time, rtt); } +base::Optional<base::TimeDelta> TestNetworkQualityEstimator::GetTransportRTT() + const { + if (start_time_null_transport_rtt_) + return start_time_null_transport_rtt_; + return NetworkQualityEstimator::GetTransportRTT(); +} + bool TestNetworkQualityEstimator::GetRecentDownlinkThroughputKbps( const base::TimeTicks& start_time, int32_t* kbps) const { |