Chromium Code Reviews| 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..55fd6f28613966d3a3123f4225a4871a880bd97a 100644 |
| --- a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
| +++ b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp |
| @@ -8,9 +8,11 @@ |
| #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/WebPresentationConnectionProxy.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include <memory> |
| @@ -32,13 +34,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 +57,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, |
| @@ -98,6 +103,14 @@ class MockWebPresentationClient : public WebPresentationClient { |
| MOCK_METHOD1(setDefaultPresentationUrls, void(const WebVector<WebURL>&)); |
| }; |
| +class MockWebPresentationConnectionProxy |
|
mark a. foltz
2017/01/23 20:18:43
Are tests that exercise this mock coming in patch
zhaobin
2017/01/24 01:23:24
Removed. Not needed here.
|
| + : public WebPresentationConnectionProxy { |
| + public: |
| + MOCK_METHOD1(SetSourceConnection, void(blink::WebPresentationConnection*)); |
| + MOCK_METHOD1(SendString, void(const blink::WebString& message)); |
| + MOCK_METHOD2(SendArrayBuffer, void(const uint8_t* data, size_t length)); |
| +}; |
| + |
| class PresentationReceiverTest : public ::testing::Test { |
| public: |
| void addConnectionavailableEventListener(EventListener*, |