| Index: content/renderer/effective_connection_type_helper.cc
|
| diff --git a/content/renderer/effective_connection_type_helper.cc b/content/renderer/effective_connection_type_helper.cc
|
| index 510cb6fe4abc1ddf97a62f9466e2c2caa27e5ecd..1b3989c1557f7d0fc5a3f28dffd2b40453a973e0 100644
|
| --- a/content/renderer/effective_connection_type_helper.cc
|
| +++ b/content/renderer/effective_connection_type_helper.cc
|
| @@ -10,28 +10,24 @@ namespace content {
|
| static_assert(static_cast<int>(a) == static_cast<int>(b), \
|
| "mismatching enums: " #a)
|
|
|
| -STATIC_ASSERT_ENUM(
|
| - net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
|
| - blink::WebEffectiveConnectionType::TypeUnknown);
|
| -STATIC_ASSERT_ENUM(
|
| - net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_OFFLINE,
|
| - blink::WebEffectiveConnectionType::TypeOffline);
|
| -STATIC_ASSERT_ENUM(
|
| - net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
|
| - blink::WebEffectiveConnectionType::TypeSlow2G);
|
| -STATIC_ASSERT_ENUM(net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_2G,
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN,
|
| + blink::WebEffectiveConnectionType::TypeUnknown);
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_OFFLINE,
|
| + blink::WebEffectiveConnectionType::TypeOffline);
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_SLOW_2G,
|
| + blink::WebEffectiveConnectionType::TypeSlow2G);
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_2G,
|
| blink::WebEffectiveConnectionType::Type2G);
|
| -STATIC_ASSERT_ENUM(net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_3G,
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_3G,
|
| blink::WebEffectiveConnectionType::Type3G);
|
| -STATIC_ASSERT_ENUM(net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_4G,
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_4G,
|
| blink::WebEffectiveConnectionType::Type4G);
|
| -STATIC_ASSERT_ENUM(
|
| - net::NetworkQualityEstimator::EFFECTIVE_CONNECTION_TYPE_BROADBAND,
|
| - blink::WebEffectiveConnectionType::TypeBroadband);
|
| +STATIC_ASSERT_ENUM(net::EFFECTIVE_CONNECTION_TYPE_BROADBAND,
|
| + blink::WebEffectiveConnectionType::TypeBroadband);
|
|
|
| blink::WebEffectiveConnectionType
|
| EffectiveConnectionTypeToWebEffectiveConnectionType(
|
| - net::NetworkQualityEstimator::EffectiveConnectionType net_type) {
|
| + net::EffectiveConnectionType net_type) {
|
| return static_cast<blink::WebEffectiveConnectionType>(net_type);
|
| }
|
|
|
|
|