| Index: Source/testing/runner/MockWebRTCDataChannelHandler.h
|
| diff --git a/Source/testing/runner/MockWebRTCDataChannelHandler.h b/Source/testing/runner/MockWebRTCDataChannelHandler.h
|
| index 3cdfbafc9409ac1822842d74ec72c3cb8accc4de..6cdff0c7fc1b16da936c8f3ab993f306a32695a9 100644
|
| --- a/Source/testing/runner/MockWebRTCDataChannelHandler.h
|
| +++ b/Source/testing/runner/MockWebRTCDataChannelHandler.h
|
| @@ -36,21 +36,21 @@ namespace WebTestRunner {
|
|
|
| class WebTestDelegate;
|
|
|
| -class MockWebRTCDataChannelHandler : public WebKit::WebRTCDataChannelHandler, public WebKit::WebNonCopyable {
|
| +class MockWebRTCDataChannelHandler : public blink::WebRTCDataChannelHandler, public blink::WebNonCopyable {
|
| public:
|
| - MockWebRTCDataChannelHandler(WebKit::WebString label, const WebKit::WebRTCDataChannelInit&, WebTestDelegate*);
|
| + MockWebRTCDataChannelHandler(blink::WebString label, const blink::WebRTCDataChannelInit&, WebTestDelegate*);
|
|
|
| - virtual void setClient(WebKit::WebRTCDataChannelHandlerClient*) OVERRIDE;
|
| - virtual WebKit::WebString label() OVERRIDE { return m_label; }
|
| + virtual void setClient(blink::WebRTCDataChannelHandlerClient*) OVERRIDE;
|
| + virtual blink::WebString label() OVERRIDE { return m_label; }
|
| virtual bool isReliable() OVERRIDE { return m_reliable; }
|
| virtual bool ordered() const OVERRIDE;
|
| virtual unsigned short maxRetransmitTime() const OVERRIDE;
|
| virtual unsigned short maxRetransmits() const OVERRIDE;
|
| - virtual WebKit::WebString protocol() const OVERRIDE;
|
| + virtual blink::WebString protocol() const OVERRIDE;
|
| virtual bool negotiated() const OVERRIDE;
|
| virtual unsigned short id() const OVERRIDE;
|
| virtual unsigned long bufferedAmount() OVERRIDE;
|
| - virtual bool sendStringData(const WebKit::WebString&) OVERRIDE;
|
| + virtual bool sendStringData(const blink::WebString&) OVERRIDE;
|
| virtual bool sendRawData(const char*, size_t) OVERRIDE;
|
| virtual void close() OVERRIDE;
|
|
|
| @@ -60,9 +60,9 @@ public:
|
| private:
|
| MockWebRTCDataChannelHandler();
|
|
|
| - WebKit::WebRTCDataChannelHandlerClient* m_client;
|
| - WebKit::WebString m_label;
|
| - WebKit::WebRTCDataChannelInit m_init;
|
| + blink::WebRTCDataChannelHandlerClient* m_client;
|
| + blink::WebString m_label;
|
| + blink::WebRTCDataChannelInit m_init;
|
| bool m_reliable;
|
| WebTaskList m_taskList;
|
| WebTestDelegate* m_delegate;
|
|
|