Refactor WebConnectionType names

Source/core/page/NetworkStateNotifierTest.cpp

 /*
  * Copyright (c) 2014, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 
 namespace {
     const double kNoneMaxBandwidthMbps = 0.0;
     const double kBluetoothMaxBandwidthMbps = 1.0;
     const double kEthernetMaxBandwidthMbps = 2.0;
 }
 
 class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
 public:
     StateObserver()
-        : m_observedType(ConnectionTypeNone)
+        : m_observedType(WebConnectionTypeNone)
         , m_observedMaxBandwidthMbps(0.0)
         , m_callbackCount(0)
     {
     }
 
     virtual void connectionChange(WebConnectionType type, double maxBandwidthMbps)
     {
         m_observedType = type;
         m_observedMaxBandwidthMbps = maxBandwidthMbps;
         m_callbackCount += 1;
@@ skipping 73 matching lines @@
 
     RefPtrWillBePersistent<Document> m_document;
     RefPtrWillBePersistent<Document> m_document2;
     NetworkStateNotifier m_notifier;
 };
 
 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));
     EXPECT_EQ(observer.callbackCount(), 1);
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveObserver)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.removeObserver(&observer1, executionContext());
     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));
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveSoleObserver)
 {
     StateObserver observer1;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.removeObserver(&observer1, executionContext());
 
     setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
-    EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeNone, kNoneMaxBandwidthMbps));
+    EXPECT_TRUE(verifyObservations(observer1, WebConnectionTypeNone, kNoneMaxBandwidthMbps));
 }
 
 TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     addObserverOnNotification(&observer1, &observer2);
 
     setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
     EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps));
@@ skipping 48 matching lines @@
 TEST_F(NetworkStateNotifierTest, RemoveFutureObserverWhileNotifying)
 {
     StateObserver observer1, observer2, observer3;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext());
     m_notifier.addObserver(&observer3, executionContext());
     removeObserverOnNotification(&observer1, &observer2);
 
     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));
 }
 
 TEST_F(NetworkStateNotifierTest, MultipleContextsAddObserver)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext2());
 
     setConnection(ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps);
     EXPECT_TRUE(verifyObservations(observer1, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps));
     EXPECT_TRUE(verifyObservations(observer2, ConnectionTypeBluetooth, kBluetoothMaxBandwidthMbps));
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveContext)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext2());
     m_notifier.removeObserver(&observer2, executionContext2());
 
     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)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext2());
     m_notifier.removeObserver(&observer1, executionContext());
     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