Removing unnecessary blink::prefix

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 26 matching lines @@
 #include "public/platform/WebConnectionType.h"
 #include "public/platform/WebThread.h"
 #include "wtf/Functional.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class StateObserver : public NetworkStateNotifier::NetworkStateObserver {
 public:
     StateObserver()
-        : m_observedType(blink::ConnectionTypeNone)
+        : m_observedType(ConnectionTypeNone)
         , m_callbackCount(0)
     {
     }
 
-    virtual void connectionTypeChange(blink::WebConnectionType type)
+    virtual void connectionTypeChange(WebConnectionType type)
     {
         m_observedType = type;
         m_callbackCount += 1;
 
         if (m_closure && !m_closure->isNull())
             (*m_closure)();
     }
 
-    blink::WebConnectionType observedType() const
+    WebConnectionType observedType() const
     {
         return m_observedType;
     }
 
     int callbackCount() const
     {
         return m_callbackCount;
     }
 
     void setNotificationCallback(PassOwnPtr<Closure> closure)
     {
         m_closure = closure;
     }
 
 private:
     OwnPtr<Closure> m_closure;
-    blink::WebConnectionType m_observedType;
+    WebConnectionType m_observedType;
     int m_callbackCount;
 };
 
 class NetworkStateNotifierTest : public ::testing::Test {
 public:
     NetworkStateNotifierTest()
         : m_document(Document::create())
         , m_document2(Document::create())
     {
     }
 
     ExecutionContext* executionContext()
     {
         return m_document.get();
     }
 
     ExecutionContext* executionContext2()
     {
         return m_document2.get();
     }
 
 protected:
-    void setType(blink::WebConnectionType type)
+    void setType(WebConnectionType type)
     {
         m_notifier.setWebConnectionType(type);
         testing::runPendingTasks();
     }
 
     void addObserverOnNotification(StateObserver* observer, StateObserver* observerToAdd)
     {
         observer->setNotificationCallback(bind(&NetworkStateNotifier::addObserver, &m_notifier, observerToAdd, executionContext()));
     }
 
     void removeObserverOnNotification(StateObserver* observer, StateObserver* observerToRemove)
     {
         observer->setNotificationCallback(bind(&NetworkStateNotifier::removeObserver, &m_notifier, observerToRemove, executionContext()));
     }
 
     RefPtrWillBePersistent<Document> m_document;
     RefPtrWillBePersistent<Document> m_document2;
     NetworkStateNotifier m_notifier;
 };
 
 TEST_F(NetworkStateNotifierTest, AddObserver)
 {
     StateObserver observer;
     m_notifier.addObserver(&observer, executionContext());
-    EXPECT_EQ(observer.observedType(), blink::ConnectionTypeNone);
+    EXPECT_EQ(observer.observedType(), ConnectionTypeNone);
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer.observedType(), ConnectionTypeBluetooth);
     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());
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeNone);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeNone);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeBluetooth);
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveSoleObserver)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.removeObserver(&observer1, executionContext());
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeNone);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeNone);
 }
 
 TEST_F(NetworkStateNotifierTest, AddObserverWhileNotifying)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     addObserverOnNotification(&observer1, &observer2);
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeBluetooth);
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveSoleObserverWhileNotifying)
 {
     StateObserver observer1;
     m_notifier.addObserver(&observer1, executionContext());
     removeObserverOnNotification(&observer1, &observer1);
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
 
-    setType(blink::ConnectionTypeEthernet);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeEthernet);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveCurrentObserverWhileNotifying)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext());
     removeObserverOnNotification(&observer1, &observer1);
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeBluetooth);
 
-    setType(blink::ConnectionTypeEthernet);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeEthernet);
+    setType(ConnectionTypeEthernet);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeEthernet);
 }
 
 TEST_F(NetworkStateNotifierTest, RemovePastObserverWhileNotifying)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext());
     removeObserverOnNotification(&observer2, &observer1);
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeBluetooth);
 
-    setType(blink::ConnectionTypeEthernet);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeEthernet);
+    setType(ConnectionTypeEthernet);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeEthernet);
 }
 
 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);
 
-    setType(blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
 
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeNone);
-    EXPECT_EQ(observer3.observedType(), blink::ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeNone);
+    EXPECT_EQ(observer3.observedType(), ConnectionTypeBluetooth);
 }
 
 TEST_F(NetworkStateNotifierTest, MultipleContextsAddObserver)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext2());
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeBluetooth);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeBluetooth);
 }
 
 TEST_F(NetworkStateNotifierTest, RemoveContext)
 {
     StateObserver observer1, observer2;
     m_notifier.addObserver(&observer1, executionContext());
     m_notifier.addObserver(&observer2, executionContext2());
     m_notifier.removeObserver(&observer2, executionContext2());
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeNone);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeBluetooth);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeNone);
 }
 
 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());
 
-    setType(blink::ConnectionTypeBluetooth);
-    EXPECT_EQ(observer1.observedType(), blink::ConnectionTypeNone);
-    EXPECT_EQ(observer2.observedType(), blink::ConnectionTypeNone);
+    setType(ConnectionTypeBluetooth);
+    EXPECT_EQ(observer1.observedType(), ConnectionTypeNone);
+    EXPECT_EQ(observer2.observedType(), ConnectionTypeNone);
 }
 
 } // namespace blink