[Presentation API] Remove references to presentation sessions.

third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/presentation/PresentationConnection.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/Document.h"
@@ skipping 150 matching lines @@
 
 void PresentationConnection::bindProxy(
     std::unique_ptr<WebPresentationConnectionProxy> proxy) {
   DCHECK(proxy);
   m_proxy = std::move(proxy);
 }
 
 // static
 PresentationConnection* PresentationConnection::take(
     ScriptPromiseResolver* resolver,
-    const WebPresentationSessionInfo& sessionInfo,
+    const WebPresentationInfo& presentationInfo,
     PresentationRequest* request) {
   ASSERT(resolver);
   ASSERT(request);
   ASSERT(resolver->getExecutionContext()->isDocument());
 
   Document* document = toDocument(resolver->getExecutionContext());
   if (!document->frame())
     return nullptr;
 
   PresentationController* controller =
       PresentationController::from(*document->frame());
   if (!controller)
     return nullptr;
 
-  return take(controller, sessionInfo, request);
+  return take(controller, presentationInfo, request);
 }
 
 // static
 PresentationConnection* PresentationConnection::take(
     PresentationController* controller,
-    const WebPresentationSessionInfo& sessionInfo,
+    const WebPresentationInfo& presentationInfo,
     PresentationRequest* request) {
   ASSERT(controller);
   ASSERT(request);
 
   PresentationConnection* connection = new PresentationConnection(
-      controller->frame(), sessionInfo.id, sessionInfo.url);
+      controller->frame(), presentationInfo.id, presentationInfo.url);
   controller->registerConnection(connection);
 
   // Fire onconnectionavailable event asynchronously.
   auto* event = PresentationConnectionAvailableEvent::create(
       EventTypeNames::connectionavailable, connection);
   TaskRunnerHelper::get(TaskType::Presentation, request->getExecutionContext())
       ->postTask(BLINK_FROM_HERE,
                  WTF::bind(&PresentationConnection::dispatchEventAsync,
                            wrapPersistent(request), wrapPersistent(event)));
 
   return connection;
 }
 
 // static
 PresentationConnection* PresentationConnection::take(
     PresentationReceiver* receiver,
-    const WebPresentationSessionInfo& sessionInfo) {
+    const WebPresentationInfo& presentationInfo) {
   DCHECK(receiver);
 
   PresentationConnection* connection = new PresentationConnection(
-      receiver->frame(), sessionInfo.id, sessionInfo.url);
+      receiver->frame(), presentationInfo.id, presentationInfo.url);
   receiver->registerConnection(connection);
 
   return connection;
 }
 
 const AtomicString& PresentationConnection::interfaceName() const {
   return EventTargetNames::PresentationConnection;
 }
 
 ExecutionContext* PresentationConnection::getExecutionContext() const {
@@ skipping 162 matching lines @@
   return m_state;
 }
 
 void PresentationConnection::close() {
   if (m_state != WebPresentationConnectionState::Connecting &&
       m_state != WebPresentationConnectionState::Connected) {
     return;
   }
   WebPresentationClient* client = presentationClient(getExecutionContext());
   if (client)
-    client->closeSession(m_url, m_id, m_proxy.get());
+    client->closeConnection(m_url, m_id, m_proxy.get());
 
   tearDown();
 }
 
 void PresentationConnection::terminate() {
   if (m_state != WebPresentationConnectionState::Connected)
     return;
   WebPresentationClient* client = presentationClient(getExecutionContext());
   if (client)
-    client->terminateConnection(m_url, m_id);
+    client->terminatePresentation(m_url, m_id);
 
   tearDown();
 }
 
 bool PresentationConnection::matches(
-    const WebPresentationSessionInfo& sessionInfo) const {
-  return m_url == KURL(sessionInfo.url) && m_id == String(sessionInfo.id);
+    const WebPresentationInfo& presentationInfo) const {
+  return m_url == KURL(presentationInfo.url) &&
+         m_id == String(presentationInfo.id);
 }
 
 bool PresentationConnection::matches(const String& id, const KURL& url) const {
   return m_url == url && m_id == id;
 }
 
 void PresentationConnection::didChangeState(
     WebPresentationConnectionState state) {
   didChangeState(state, true /* shouldDispatchEvent */);
 }
@@ skipping 86 matching lines @@
 void PresentationConnection::tearDown() {
   // Cancel current Blob loading if any.
   if (m_blobLoader) {
     m_blobLoader->cancel();
     m_blobLoader.clear();
   }
   m_messages.clear();
 }
 
 }  // namespace blink