Cleanup namespace usage in Source/core/modules/[mediasource/* to websockets/*]

Source/modules/websockets/NewWebSocketChannelImpl.h

 /*
  * Copyright (C) 2013 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 34 matching lines @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
-class WebSocketHandshakeRequestInfo;
-class WebSocketHandshakeResponseInfo;
-
-} // namespace blink
-
-namespace blink {
-
 class Document;
 class WebSocketHandshakeRequest;
+class WebSocketHandshakeRequestInfo;
+class WebSocketHandshakeResponseInfo;
 
 // This class may replace MainThreadWebSocketChannel.
-class NewWebSocketChannelImpl FINAL : public WebSocketChannel, public blink::WebSocketHandleClient, public ContextLifecycleObserver {
+class NewWebSocketChannelImpl FINAL : public WebSocketChannel, public WebSocketHandleClient, public ContextLifecycleObserver {
 public:
     // You can specify the source file and the line number information
     // explicitly by passing the last parameter.
     // In the usual case, they are set automatically and you don't have to
     // pass it.
     // Specify handle explicitly only in tests.
-    static NewWebSocketChannelImpl* create(ExecutionContext* context, WebSocketChannelClient* client, const String& sourceURL = String(), unsigned lineNumber = 0, blink::WebSocketHandle *handle = 0)
+    static NewWebSocketChannelImpl* create(ExecutionContext* context, WebSocketChannelClient* client, const String& sourceURL = String(), unsigned lineNumber = 0, WebSocketHandle *handle = 0)
     {
         return adoptRefCountedGarbageCollected(new NewWebSocketChannelImpl(context, client, sourceURL, lineNumber, handle));
     }
     virtual ~NewWebSocketChannelImpl();
 
     // WebSocketChannel functions.
     virtual bool connect(const KURL&, const String& protocol) OVERRIDE;
     virtual void send(const String& message) OVERRIDE;
     virtual void send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) OVERRIDE;
     virtual void send(PassRefPtr<BlobDataHandle>) OVERRIDE;
@@ skipping 35 matching lines @@
         String reason;
     };
 
     struct ReceivedMessage {
         bool isMessageText;
         Vector<char> data;
     };
 
     class BlobLoader;
 
-    NewWebSocketChannelImpl(ExecutionContext*, WebSocketChannelClient*, const String&, unsigned, blink::WebSocketHandle*);
+    NewWebSocketChannelImpl(ExecutionContext*, WebSocketChannelClient*, const String&, unsigned, WebSocketHandle*);
     void sendInternal();
     void flowControlIfNecessary();
     void failAsError(const String& reason) { fail(reason, ErrorMessageLevel, m_sourceURLAtConstruction, m_lineNumberAtConstruction); }
     void abortAsyncOperations();
     void handleDidClose(bool wasClean, unsigned short code, const String& reason);
     Document* document(); // can be called only when m_identifier > 0.
 
     // WebSocketHandleClient functions.
-    virtual void didConnect(blink::WebSocketHandle*, bool fail, const blink::WebString& selectedProtocol, const blink::WebString& extensions) OVERRIDE;
-    virtual void didStartOpeningHandshake(blink::WebSocketHandle*, const blink::WebSocketHandshakeRequestInfo&) OVERRIDE;
-    virtual void didFinishOpeningHandshake(blink::WebSocketHandle*, const blink::WebSocketHandshakeResponseInfo&) OVERRIDE;
-    virtual void didFail(blink::WebSocketHandle*, const blink::WebString& message) OVERRIDE;
-    virtual void didReceiveData(blink::WebSocketHandle*, bool fin, blink::WebSocketHandle::MessageType, const char* data, size_t /* size */) OVERRIDE;
-    virtual void didClose(blink::WebSocketHandle*, bool wasClean, unsigned short code, const blink::WebString& reason) OVERRIDE;
-    virtual void didReceiveFlowControl(blink::WebSocketHandle*, int64_t quota) OVERRIDE;
-    virtual void didStartClosingHandshake(blink::WebSocketHandle*) OVERRIDE;
+    virtual void didConnect(WebSocketHandle*, bool fail, const WebString& selectedProtocol, const WebString& extensions) OVERRIDE;
+    virtual void didStartOpeningHandshake(WebSocketHandle*, const WebSocketHandshakeRequestInfo&) OVERRIDE;
+    virtual void didFinishOpeningHandshake(WebSocketHandle*, const WebSocketHandshakeResponseInfo&) OVERRIDE;
+    virtual void didFail(WebSocketHandle*, const WebString& message) OVERRIDE;
+    virtual void didReceiveData(WebSocketHandle*, bool fin, WebSocketHandle::MessageType, const char* data, size_t /* size */) OVERRIDE;
+    virtual void didClose(WebSocketHandle*, bool wasClean, unsigned short code, const WebString& reason) OVERRIDE;
+    virtual void didReceiveFlowControl(WebSocketHandle*, int64_t quota) OVERRIDE;
+    virtual void didStartClosingHandshake(WebSocketHandle*) OVERRIDE;
 
     // Methods for BlobLoader.
     void didFinishLoadingBlob(PassRefPtr<ArrayBuffer>);
     void didFailLoadingBlob(FileError::ErrorCode);
 
     // LifecycleObserver functions.
     virtual void contextDestroyed() OVERRIDE
     {
         // In oilpan we cannot assume this channel's finalizer has been called
         // before the document it is observing is dead and finalized since there
         // is no eager finalization. Instead the finalization happens at the
         // next GC which could be long enough after the Peer::destroy call for
         // the context (ie. Document) to be dead too. If the context's finalizer
         // is run first this method gets called. Instead we assert the channel
         // has been disconnected which happens in Peer::destroy.
         ASSERT(!m_handle);
         ASSERT(!m_client);
         ASSERT(!m_identifier);
         ContextLifecycleObserver::contextDestroyed();
     }
 
     // m_handle is a handle of the connection.
     // m_handle == 0 means this channel is closed.
-    OwnPtr<blink::WebSocketHandle> m_handle;
+    OwnPtr<WebSocketHandle> m_handle;
 
     // m_client can be deleted while this channel is alive, but this class
     // expects that disconnect() is called before the deletion.
     Member<WebSocketChannelClient> m_client;
     KURL m_url;
     // m_identifier > 0 means calling scriptContextExecution() returns a Document.
     unsigned long m_identifier;
     Member<BlobLoader> m_blobLoader;
     Deque<OwnPtr<Message> > m_messages;
     Vector<char> m_receivingMessageData;
 
     bool m_receivingMessageTypeIsText;
     int64_t m_sendingQuota;
     int64_t m_receivedDataSizeForFlowControl;
     size_t m_sentSizeOfTopMessage;
 
     String m_sourceURLAtConstruction;
     unsigned m_lineNumberAtConstruction;
     RefPtr<WebSocketHandshakeRequest> m_handshakeRequest;
 
     static const int64_t receivedDataSizeForFlowControlHighWaterMark = 1 << 15;
 };
 
 } // namespace blink
 
 #endif // NewWebSocketChannelImpl_h