Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Unified Diff: net/nqe/network_quality_estimator_unittest.cc

Issue 2183153002: NQE: Move ECT to net:: namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased, also fixed comnpilation error Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/nqe/network_quality_estimator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/nqe/network_quality_estimator_unittest.cc
diff --git a/net/nqe/network_quality_estimator_unittest.cc b/net/nqe/network_quality_estimator_unittest.cc
index c61d5b772f0310fc6f8665010e4e81e794d22f40..0280fbcc6f5b0e302033d49f07b52d30490b5be3 100644
--- a/net/nqe/network_quality_estimator_unittest.cc
+++ b/net/nqe/network_quality_estimator_unittest.cc
@@ -28,6 +28,7 @@
#include "net/base/load_flags.h"
#include "net/base/network_change_notifier.h"
#include "net/http/http_status_code.h"
+#include "net/nqe/effective_connection_type.h"
#include "net/nqe/external_estimate_provider.h"
#include "net/nqe/network_quality_observation.h"
#include "net/nqe/network_quality_observation_source.h"
@@ -320,20 +321,17 @@ class TestNetworkQualityEstimator : public NetworkQualityEstimator {
class TestEffectiveConnectionTypeObserver
: public NetworkQualityEstimator::EffectiveConnectionTypeObserver {
public:
- std::vector<NetworkQualityEstimator::EffectiveConnectionType>&
- effective_connection_types() {
+ std::vector<EffectiveConnectionType>& effective_connection_types() {
return effective_connection_types_;
}
// EffectiveConnectionTypeObserver implementation:
- void OnEffectiveConnectionTypeChanged(
- NetworkQualityEstimator::EffectiveConnectionType type) override {
+ void OnEffectiveConnectionTypeChanged(EffectiveConnectionType type) override {
effective_connection_types_.push_back(type);
}
private:
- std::vector<NetworkQualityEstimator::EffectiveConnectionType>
- effective_connection_types_;
+ std::vector<EffectiveConnectionType> effective_connection_types_;
};
class TestRTTObserver : public NetworkQualityEstimator::RTTObserver {
@@ -427,9 +425,7 @@ TEST(NetworkQualityEstimatorTest, TestKbpsRTTUpdates) {
histogram_tester.ExpectTotalCount("NQE.FastestRTT.Unknown", 0);
histogram_tester.ExpectUniqueSample(
"NQE.MainFrame.EffectiveConnectionType.Unknown",
- NetworkQualityEstimator::EffectiveConnectionType::
- EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
- 1);
+ EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_UNKNOWN, 1);
std::unique_ptr<URLRequest> request2(context.CreateRequest(
estimator.GetEchoURL(), DEFAULT_PRIORITY, &test_delegate));
@@ -484,9 +480,7 @@ TEST(NetworkQualityEstimatorTest, TestKbpsRTTUpdates) {
base::RunLoop().Run();
histogram_tester.ExpectUniqueSample(
"NQE.MainFrame.EffectiveConnectionType.WiFi",
- NetworkQualityEstimator::EffectiveConnectionType::
- EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
- 1);
+ EffectiveConnectionType::EFFECTIVE_CONNECTION_TYPE_UNKNOWN, 1);
estimator.SimulateNetworkChangeTo(
NetworkChangeNotifier::ConnectionType::CONNECTION_UNKNOWN, "test");
@@ -699,14 +693,12 @@ TEST(NetworkQualityEstimatorTest, Offline) {
const struct {
NetworkChangeNotifier::ConnectionType connection_type;
- NetworkQualityEstimator::EffectiveConnectionType expected_connection_type;
+ EffectiveConnectionType expected_connection_type;
} tests[] = {
- {NetworkChangeNotifier::CONNECTION_2G,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_UNKNOWN},
+ {NetworkChangeNotifier::CONNECTION_2G, EFFECTIVE_CONNECTION_TYPE_UNKNOWN},
{NetworkChangeNotifier::CONNECTION_NONE,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {NetworkChangeNotifier::CONNECTION_3G,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_UNKNOWN},
+ EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {NetworkChangeNotifier::CONNECTION_3G, EFFECTIVE_CONNECTION_TYPE_UNKNOWN},
};
for (const auto& test : tests) {
@@ -737,21 +729,21 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyRTT) {
const struct {
int32_t rtt_msec;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
- {5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {700, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {400, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {300, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {200, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {100, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1000, EFFECTIVE_CONNECTION_TYPE_2G},
+ {700, EFFECTIVE_CONNECTION_TYPE_3G},
+ {500, EFFECTIVE_CONNECTION_TYPE_3G},
+ {400, EFFECTIVE_CONNECTION_TYPE_4G},
+ {300, EFFECTIVE_CONNECTION_TYPE_4G},
+ {200, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {100, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
};
for (const auto& test : tests) {
@@ -770,26 +762,25 @@ TEST(NetworkQualityEstimatorTest, DefaultTransportRTTBasedThresholds) {
const struct {
bool override_defaults_using_variation_params;
int32_t transport_rtt_msec;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
// When the variation params do not override connection thresholds,
// default values should be used.
- {false, 5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {false, 1000,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {false, 20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 5000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 4000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {false, 1000, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
// Override default thresholds using variation params.
- {true, 5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {true, 4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {true, 3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {true, 2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {true, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {true, 5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {true, 4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {true, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {true, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {true, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {true, 1000, EFFECTIVE_CONNECTION_TYPE_2G},
+ {true, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
};
for (const auto& test : tests) {
@@ -825,26 +816,25 @@ TEST(NetworkQualityEstimatorTest, DefaultHttpRTTBasedThresholds) {
const struct {
bool override_defaults_using_variation_params;
int32_t http_rtt_msec;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
// When the variation params do not override connection thresholds,
// default values should be used.
- {false, 5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {false, 2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {false, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {false, 1000,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {false, 20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 5000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 4000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {false, 2000, EFFECTIVE_CONNECTION_TYPE_2G},
+ {false, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {false, 1000, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {false, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
// Override default thresholds using variation params.
- {true, 5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {true, 4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {true, 3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {true, 2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {true, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {true, 20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {true, 5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {true, 4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {true, 3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {true, 2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {true, 1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {true, 1000, EFFECTIVE_CONNECTION_TYPE_2G},
+ {true, 20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
};
for (const auto& test : tests) {
@@ -895,21 +885,21 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsOnlyTransportRTT) {
const struct {
int32_t transport_rtt_msec;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
- {5000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {4000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {3000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {2000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {700, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {400, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {300, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {200, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {100, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {20, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {5000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {4000, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {3000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {2000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1500, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1000, EFFECTIVE_CONNECTION_TYPE_2G},
+ {700, EFFECTIVE_CONNECTION_TYPE_3G},
+ {500, EFFECTIVE_CONNECTION_TYPE_3G},
+ {400, EFFECTIVE_CONNECTION_TYPE_4G},
+ {300, EFFECTIVE_CONNECTION_TYPE_4G},
+ {200, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {100, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {20, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
};
for (const auto& test : tests) {
@@ -953,25 +943,25 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsHttpRTTandThroughput) {
const struct {
int32_t rtt_msec;
int32_t downlink_throughput_kbps;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
// Set RTT to a very low value to observe the effect of throughput.
// Throughput is the bottleneck.
- {1, 5, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {1, 10, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {1, 50, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1, 100, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1, 150, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1, 300, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1, 400, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {1, 500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {1, 700, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {1, 2500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 5, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {1, 10, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {1, 50, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1, 100, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1, 150, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1, 300, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1, 400, EFFECTIVE_CONNECTION_TYPE_3G},
+ {1, 500, EFFECTIVE_CONNECTION_TYPE_3G},
+ {1, 700, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 1500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 2500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
// Set both RTT and throughput. RTT is the bottleneck.
- {3000, 25000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {700, 25000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
+ {3000, 25000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {700, 25000, EFFECTIVE_CONNECTION_TYPE_3G},
};
for (const auto& test : tests) {
@@ -1017,25 +1007,25 @@ TEST(NetworkQualityEstimatorTest, ObtainThresholdsTransportRTTandThroughput) {
const struct {
int32_t transport_rtt_msec;
int32_t downlink_throughput_kbps;
- NetworkQualityEstimator::EffectiveConnectionType expected_conn_type;
+ EffectiveConnectionType expected_conn_type;
} tests[] = {
// Set RTT to a very low value to observe the effect of throughput.
// Throughput is the bottleneck.
- {1, 5, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {1, 10, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE},
- {1, 50, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1, 100, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {1, 150, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1, 300, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
- {1, 400, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {1, 500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
- {1, 700, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
- {1, 1500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
- {1, 2500, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 5, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {1, 10, EFFECTIVE_CONNECTION_TYPE_OFFLINE},
+ {1, 50, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1, 100, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {1, 150, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1, 300, EFFECTIVE_CONNECTION_TYPE_2G},
+ {1, 400, EFFECTIVE_CONNECTION_TYPE_3G},
+ {1, 500, EFFECTIVE_CONNECTION_TYPE_3G},
+ {1, 700, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 1000, EFFECTIVE_CONNECTION_TYPE_4G},
+ {1, 1500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ {1, 2500, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
// Set both RTT and throughput. RTT is the bottleneck.
- {3000, 25000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
- {700, 25000, NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G},
+ {3000, 25000, EFFECTIVE_CONNECTION_TYPE_SLOW_2G},
+ {700, 25000, EFFECTIVE_CONNECTION_TYPE_3G},
};
for (const auto& test : tests) {
@@ -1150,18 +1140,16 @@ TEST(NetworkQualityEstimatorTest, TestGetMetricsSince) {
base::TimeDelta expected_http_rtt;
base::TimeDelta expected_transport_rtt;
int32_t expected_downstream_throughput;
- NetworkQualityEstimator::EffectiveConnectionType
- expected_effective_connection_type;
+ EffectiveConnectionType expected_effective_connection_type;
} tests[] = {
{now + base::TimeDelta::FromSeconds(10), false,
base::TimeDelta::FromMilliseconds(0),
base::TimeDelta::FromMilliseconds(0), 0,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ EFFECTIVE_CONNECTION_TYPE_BROADBAND},
{now, true, new_url_rtt, new_tcp_rtt, new_downlink_kbps,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G},
+ EFFECTIVE_CONNECTION_TYPE_4G},
{old - base::TimeDelta::FromMicroseconds(500), true, old_url_rtt,
- old_tcp_rtt, old_downlink_kbps,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND},
+ old_tcp_rtt, old_downlink_kbps, EFFECTIVE_CONNECTION_TYPE_BROADBAND},
};
for (const auto& test : tests) {
@@ -1511,8 +1499,7 @@ TEST(NetworkQualityEstimatorTest, TestEffectiveConnectionTypeObserver) {
EXPECT_EQ(0U, observer.effective_connection_types().size());
- estimator.set_effective_connection_type(
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G);
+ estimator.set_effective_connection_type(EFFECTIVE_CONNECTION_TYPE_2G);
tick_clock_ptr->Advance(base::TimeDelta::FromMinutes(60));
std::unique_ptr<URLRequest> request(context.CreateRequest(
@@ -1523,9 +1510,7 @@ TEST(NetworkQualityEstimatorTest, TestEffectiveConnectionTypeObserver) {
EXPECT_EQ(1U, observer.effective_connection_types().size());
histogram_tester.ExpectUniqueSample(
"NQE.MainFrame.EffectiveConnectionType.Unknown",
- NetworkQualityEstimator::EffectiveConnectionType::
- EFFECTIVE_CONNECTION_TYPE_2G,
- 1);
+ EFFECTIVE_CONNECTION_TYPE_2G, 1);
// Next request should not trigger recomputation of effective connection type
// since there has been no change in the clock.
@@ -1537,8 +1522,7 @@ TEST(NetworkQualityEstimatorTest, TestEffectiveConnectionTypeObserver) {
EXPECT_EQ(1U, observer.effective_connection_types().size());
// Change in connection type should send out notification to the observers.
- estimator.set_effective_connection_type(
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G);
+ estimator.set_effective_connection_type(EFFECTIVE_CONNECTION_TYPE_3G);
estimator.SimulateNetworkChangeTo(NetworkChangeNotifier::CONNECTION_WIFI,
"test");
EXPECT_EQ(2U, observer.effective_connection_types().size());
@@ -1546,8 +1530,7 @@ TEST(NetworkQualityEstimatorTest, TestEffectiveConnectionTypeObserver) {
// A change in effective connection type does not trigger notification to the
// observers, since it is not accompanied by any new observation or a network
// change event.
- estimator.set_effective_connection_type(
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G);
+ estimator.set_effective_connection_type(EFFECTIVE_CONNECTION_TYPE_3G);
EXPECT_EQ(2U, observer.effective_connection_types().size());
}
@@ -1714,9 +1697,7 @@ TEST(NetworkQualityEstimatorTest, MAYBE_TestTCPSocketRTT) {
"NQE.MainFrame.EffectiveConnectionType.Unknown", num_requests);
histogram_tester.ExpectBucketCount(
"NQE.MainFrame.EffectiveConnectionType.Unknown",
- NetworkQualityEstimator::EffectiveConnectionType::
- EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
- 1);
+ EFFECTIVE_CONNECTION_TYPE_UNKNOWN, 1);
}
#if defined(OS_IOS)
@@ -1739,31 +1720,27 @@ TEST(NetworkQualityEstimatorTest, MAYBE_RecordAccuracy) {
base::TimeDelta recent_rtt;
int32_t downstream_throughput_kbps;
int32_t recent_downstream_throughput_kbps;
- NetworkQualityEstimator::EffectiveConnectionType effective_connection_type;
- NetworkQualityEstimator::EffectiveConnectionType
- recent_effective_connection_type;
+ EffectiveConnectionType effective_connection_type;
+ EffectiveConnectionType recent_effective_connection_type;
} tests[] = {
{base::TimeDelta::FromMilliseconds(expected_rtt_msec),
base::TimeDelta::FromMilliseconds(expected_rtt_msec),
expected_downstream_throughput_kbps, expected_downstream_throughput_kbps,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G},
+ EFFECTIVE_CONNECTION_TYPE_2G, EFFECTIVE_CONNECTION_TYPE_2G},
{
base::TimeDelta::FromMilliseconds(expected_rtt_msec + 1),
base::TimeDelta::FromMilliseconds(expected_rtt_msec),
expected_downstream_throughput_kbps + 1,
- expected_downstream_throughput_kbps,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G,
+ expected_downstream_throughput_kbps, EFFECTIVE_CONNECTION_TYPE_3G,
+ EFFECTIVE_CONNECTION_TYPE_2G,
},
{
base::TimeDelta::FromMilliseconds(expected_rtt_msec - 1),
base::TimeDelta::FromMilliseconds(expected_rtt_msec),
expected_downstream_throughput_kbps - 1,
expected_downstream_throughput_kbps,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
- NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G,
+ EFFECTIVE_CONNECTION_TYPE_SLOW_2G, EFFECTIVE_CONNECTION_TYPE_2G,
},
};
@@ -1889,11 +1866,9 @@ TEST(NetworkQualityEstimatorTest, MAYBE_RecordAccuracy) {
// Tests that the effective connection type is converted correctly to a
// descriptive string name, and vice-versa.
TEST(NetworkQualityEstimatorTest, NameConnectionTypeConversion) {
- for (size_t i = 0;
- i < NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_LAST; ++i) {
- const NetworkQualityEstimator::EffectiveConnectionType
- effective_connection_type =
- static_cast<NetworkQualityEstimator::EffectiveConnectionType>(i);
+ for (size_t i = 0; i < EFFECTIVE_CONNECTION_TYPE_LAST; ++i) {
+ const EffectiveConnectionType effective_connection_type =
+ static_cast<EffectiveConnectionType>(i);
std::string connection_type_name =
std::string(NetworkQualityEstimator::GetNameForEffectiveConnectionType(
effective_connection_type));
« no previous file with comments | « net/nqe/network_quality_estimator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698