Index: Source/core/page/NetworkStateNotifierTest.cpp |
diff --git a/Source/core/page/NetworkStateNotifierTest.cpp b/Source/core/page/NetworkStateNotifierTest.cpp |
index b800d9b3817ed96de65b494adf5a0cbbde3cc98c..3f5f091c9adff2deef8d95f53a09537b4915b242 100644 |
--- a/Source/core/page/NetworkStateNotifierTest.cpp |
+++ b/Source/core/page/NetworkStateNotifierTest.cpp |
@@ -50,7 +50,7 @@ namespace { |
class StateObserver : public NetworkStateNotifier::NetworkStateObserver { |
public: |
StateObserver() |
- : m_observedType(ConnectionTypeNone) |
+ : m_observedType(WebConnectionTypeNone) |
, m_observedMaxBandwidthMbps(0.0) |
, m_callbackCount(0) |
{ |
@@ -144,7 +144,7 @@ TEST_F(NetworkStateNotifierTest, AddObserver) |
{ |
StateObserver observer; |
m_notifier.addObserver(&observer, executionContext()); |
- EXPECT_TRUE(verifyObservations(observer, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
EXPECT_TRUE(verifyObservations(observer, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps)); |
@@ -159,7 +159,7 @@ TEST_F(NetworkStateNotifierTest, RemoveObserver) |
m_notifier.addObserver(&observer2, executionContext()); |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
- EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
EXPECT_TRUE(verifyObservations(observer2, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps)); |
} |
@@ -170,7 +170,7 @@ TEST_F(NetworkStateNotifierTest, RemoveSoleObserver) |
m_notifier.removeObserver(&observer1, executionContext()); |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
- EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
} |
TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying) |
@@ -239,7 +239,7 @@ TEST_F(NetworkStateNotifierTest, RemoveFutureObserverWhileNotifying) |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps)); |
- EXPECT_TRUE(verifyObservations(observer2, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
EXPECT_TRUE(verifyObservations(observer3, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps)); |
} |
@@ -263,7 +263,7 @@ TEST_F(NetworkStateNotifierTest, RemoveContext) |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps)); |
- EXPECT_TRUE(verifyObservations(observer2, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
} |
TEST_F(NetworkStateNotifierTest, RemoveAllContexts) |
@@ -275,8 +275,8 @@ TEST_F(NetworkStateNotifierTest, RemoveAllContexts) |
m_notifier.removeObserver(&observer2, executionContext2()); |
setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps); |
- EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
- EXPECT_TRUE(verifyObservations(observer2, ConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
+ EXPECT_TRUE(verifyObservations(observer2, WebConnectionTypeNone, kNoneMaxBandwidthMbps)); |
} |
} // namespace blink |