| Index: Source/modules/mediastream/RTCDataChannel.h | 
| diff --git a/Source/modules/mediastream/RTCDataChannel.h b/Source/modules/mediastream/RTCDataChannel.h | 
| index 5ab942268cbd8d5399284097bedaf545c87b7cfe..ef9ba146279bcee66d4f7173f4a55af456b44189 100644 | 
| --- a/Source/modules/mediastream/RTCDataChannel.h | 
| +++ b/Source/modules/mediastream/RTCDataChannel.h | 
| @@ -32,26 +32,23 @@ | 
| #include "public/platform/WebRTCDataChannelHandlerClient.h" | 
|  | 
| namespace blink { | 
| -class WebRTCDataChannelHandler; | 
| -class WebRTCPeerConnectionHandler; | 
| -struct WebRTCDataChannelInit; | 
| -} | 
| - | 
| -namespace blink { | 
|  | 
| class Blob; | 
| class ExceptionState; | 
| class RTCPeerConnection; | 
| +class WebRTCDataChannelHandler; | 
| +class WebRTCPeerConnectionHandler; | 
| +struct WebRTCDataChannelInit; | 
|  | 
| class RTCDataChannel FINAL | 
| : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<RTCDataChannel> | 
| , public EventTargetWithInlineData | 
| -    , public blink::WebRTCDataChannelHandlerClient { | 
| +    , public WebRTCDataChannelHandlerClient { | 
| DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<RTCDataChannel>); | 
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCDataChannel); | 
| public: | 
| -    static RTCDataChannel* create(ExecutionContext*, RTCPeerConnection*, PassOwnPtr<blink::WebRTCDataChannelHandler>); | 
| -    static RTCDataChannel* create(ExecutionContext*, RTCPeerConnection*, blink::WebRTCPeerConnectionHandler*, const String& label, const blink::WebRTCDataChannelInit&, ExceptionState&); | 
| +    static RTCDataChannel* create(ExecutionContext*, RTCPeerConnection*, PassOwnPtr<WebRTCDataChannelHandler>); | 
| +    static RTCDataChannel* create(ExecutionContext*, RTCPeerConnection*, WebRTCPeerConnectionHandler*, const String& label, const WebRTCDataChannelInit&, ExceptionState&); | 
| virtual ~RTCDataChannel(); | 
|  | 
| String label() const; | 
| @@ -93,24 +90,24 @@ public: | 
| virtual void trace(Visitor*) OVERRIDE; | 
|  | 
| private: | 
| -    RTCDataChannel(ExecutionContext*, RTCPeerConnection*, PassOwnPtr<blink::WebRTCDataChannelHandler>); | 
| +    RTCDataChannel(ExecutionContext*, RTCPeerConnection*, PassOwnPtr<WebRTCDataChannelHandler>); | 
|  | 
| void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>); | 
| void scheduledEventTimerFired(Timer<RTCDataChannel>*); | 
|  | 
| ExecutionContext* m_executionContext; | 
|  | 
| -    // blink::WebRTCDataChannelHandlerClient | 
| -    virtual void didChangeReadyState(blink::WebRTCDataChannelHandlerClient::ReadyState) OVERRIDE; | 
| -    virtual void didReceiveStringData(const blink::WebString&) OVERRIDE; | 
| +    // WebRTCDataChannelHandlerClient | 
| +    virtual void didChangeReadyState(WebRTCDataChannelHandlerClient::ReadyState) OVERRIDE; | 
| +    virtual void didReceiveStringData(const WebString&) OVERRIDE; | 
| virtual void didReceiveRawData(const char*, size_t) OVERRIDE; | 
| virtual void didDetectError() OVERRIDE; | 
|  | 
| -    OwnPtr<blink::WebRTCDataChannelHandler> m_handler; | 
| +    OwnPtr<WebRTCDataChannelHandler> m_handler; | 
|  | 
| bool m_stopped; | 
|  | 
| -    blink::WebRTCDataChannelHandlerClient::ReadyState m_readyState; | 
| +    WebRTCDataChannelHandlerClient::ReadyState m_readyState; | 
|  | 
| enum BinaryType { | 
| BinaryTypeBlob, | 
|  |