Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1293)

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp

Issue 2737413003: [Presentation API] Remove references to presentation sessions. (Closed)
Patch Set: Update PresentationServiceDelegateImpl unittest Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 18fa59868914e793774e62c20306ed58de9b6452..11c7dc3ef637839834b1d6c9e6758b77862b9ee6 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationReceiverTest.cpp
@@ -34,16 +34,16 @@ class MockEventListener : public EventListener {
};
class MockWebPresentationClient : public WebPresentationClient {
- void startSession(
+ void startPresentation(
const WebVector<WebURL>& presentationUrls,
std::unique_ptr<WebPresentationConnectionCallbacks> callbacks) override {
- return startSession_(presentationUrls, callbacks);
+ return startPresentation_(presentationUrls, callbacks);
}
- void joinSession(
+ void reconnectPresentation(
const WebVector<WebURL>& presentationUrls,
const WebString& presentationId,
std::unique_ptr<WebPresentationConnectionCallbacks> callbacks) override {
- return joinSession_(presentationUrls, presentationId, callbacks);
+ return reconnectPresentation_(presentationUrls, presentationId, callbacks);
}
void getAvailability(const WebVector<WebURL>& availabilityURLs,
@@ -57,11 +57,11 @@ class MockWebPresentationClient : public WebPresentationClient {
MOCK_METHOD1(setReceiver, void(WebPresentationReceiver*));
- MOCK_METHOD2(startSession_,
+ MOCK_METHOD2(startPresentation_,
void(const WebVector<WebURL>& presentationUrls,
std::unique_ptr<WebPresentationConnectionCallbacks>&));
- MOCK_METHOD3(joinSession_,
+ MOCK_METHOD3(reconnectPresentation_,
void(const WebVector<WebURL>& presentationUrls,
const WebString& presentationId,
std::unique_ptr<WebPresentationConnectionCallbacks>&));
@@ -86,12 +86,12 @@ class MockWebPresentationClient : public WebPresentationClient {
size_t length,
const WebPresentationConnectionProxy* proxy));
- MOCK_METHOD3(closeSession,
+ MOCK_METHOD3(closeConnection,
void(const WebURL& presentationUrl,
const WebString& presentationId,
const WebPresentationConnectionProxy*));
- MOCK_METHOD2(terminateConnection,
+ MOCK_METHOD2(terminatePresentation,
void(const WebURL& presentationUrl,
const WebString& presentationId));
@@ -164,7 +164,7 @@ TEST_F(PresentationReceiverTest, OneConnectionResolvedConnectionListNoEvent) {
// Receive first connection.
receiver->onReceiverConnectionAvailable(
- WebPresentationSessionInfo(KURL(KURL(), "http://example.com"), "id"));
+ WebPresentationInfo(KURL(KURL(), "http://example.com"), "id"));
verifyConnectionListPropertyState(ScriptPromisePropertyBase::Resolved,
receiver);
@@ -182,12 +182,12 @@ TEST_F(PresentationReceiverTest, TwoConnectionsFireOnconnectionavailableEvent) {
receiver->connectionList(scope.getScriptState());
- WebPresentationSessionInfo sessionInfo(KURL(KURL(), "http://example.com"),
- "id");
+ WebPresentationInfo presentationInfo(KURL(KURL(), "http://example.com"),
+ "id");
// Receive first connection.
- receiver->onReceiverConnectionAvailable(sessionInfo);
+ receiver->onReceiverConnectionAvailable(presentationInfo);
// Receive second connection.
- receiver->onReceiverConnectionAvailable(sessionInfo);
+ receiver->onReceiverConnectionAvailable(presentationInfo);
verifyConnectionListSize(2, receiver);
}
@@ -201,14 +201,14 @@ TEST_F(PresentationReceiverTest, TwoConnectionsNoEvent) {
addConnectionavailableEventListener(eventHandler, receiver);
EXPECT_CALL(*eventHandler, handleEvent(testing::_, testing::_)).Times(0);
- WebPresentationSessionInfo sessionInfo(KURL(KURL(), "http://example.com"),
- "id");
+ WebPresentationInfo presentationInfo(KURL(KURL(), "http://example.com"),
+ "id");
// Receive first connection.
- auto* connection1 = receiver->onReceiverConnectionAvailable(sessionInfo);
+ auto* connection1 = receiver->onReceiverConnectionAvailable(presentationInfo);
EXPECT_TRUE(connection1);
// Receive second connection.
- auto* connection2 = receiver->onReceiverConnectionAvailable(sessionInfo);
+ auto* connection2 = receiver->onReceiverConnectionAvailable(presentationInfo);
EXPECT_TRUE(connection2);
receiver->connectionList(scope.getScriptState());

Powered by Google App Engine
This is Rietveld 408576698