Index: third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
index 6d6dc956e48d2975c8973695678c9767495e664b..a57a899b59ae8851939c6c12f425d23c0d432ba1 100644 |
--- a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
+++ b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
@@ -8,9 +8,12 @@ |
#include "bindings/core/v8/V8BindingForTesting.h" |
#include "core/frame/LocalFrame.h" |
#include "core/testing/DummyPageHolder.h" |
+#include "modules/presentation/PresentationConnection.h" |
#include "modules/presentation/PresentationConnectionList.h" |
#include "platform/testing/URLTestHelpers.h" |
#include "public/platform/modules/presentation/WebPresentationClient.h" |
+#include "public/platform/modules/presentation/WebPresentationConnectionCallbacks.h" |
+#include "public/platform/modules/presentation/WebPresentationConnectionProxy.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include <memory> |
@@ -32,13 +35,13 @@ class MockEventListener : public EventListener { |
class MockWebPresentationClient : public WebPresentationClient { |
void startSession( |
const WebVector<WebURL>& presentationUrls, |
- std::unique_ptr<WebPresentationConnectionCallback> callbacks) override { |
+ std::unique_ptr<WebPresentationConnectionCallbacks> callbacks) override { |
return startSession_(presentationUrls, callbacks); |
} |
void joinSession( |
const WebVector<WebURL>& presentationUrls, |
const WebString& presentationId, |
- std::unique_ptr<WebPresentationConnectionCallback> callbacks) override { |
+ std::unique_ptr<WebPresentationConnectionCallbacks> callbacks) override { |
return joinSession_(presentationUrls, presentationId, callbacks); |
} |
@@ -55,29 +58,32 @@ class MockWebPresentationClient : public WebPresentationClient { |
MOCK_METHOD2(startSession_, |
void(const WebVector<WebURL>& presentationUrls, |
- std::unique_ptr<WebPresentationConnectionCallback>&)); |
+ std::unique_ptr<WebPresentationConnectionCallbacks>&)); |
MOCK_METHOD3(joinSession_, |
void(const WebVector<WebURL>& presentationUrls, |
const WebString& presentationId, |
- std::unique_ptr<WebPresentationConnectionCallback>&)); |
+ std::unique_ptr<WebPresentationConnectionCallbacks>&)); |
- MOCK_METHOD3(sendString, |
+ MOCK_METHOD4(sendString, |
void(const WebURL& presentationUrl, |
const WebString& presentationId, |
- const WebString& message)); |
+ const WebString& message, |
+ const WebPresentationConnectionProxy* proxy)); |
- MOCK_METHOD4(sendArrayBuffer, |
+ MOCK_METHOD5(sendArrayBuffer, |
void(const WebURL& presentationUrl, |
const WebString& presentationId, |
const uint8_t* data, |
- size_t length)); |
+ size_t length, |
+ const WebPresentationConnectionProxy* proxy)); |
- MOCK_METHOD4(sendBlobData, |
+ MOCK_METHOD5(sendBlobData, |
void(const WebURL& presentationUrl, |
const WebString& presentationId, |
const uint8_t* data, |
- size_t length)); |
+ size_t length, |
+ const WebPresentationConnectionProxy* proxy)); |
MOCK_METHOD2(closeSession, |
void(const WebURL& presentationUrl, |