[PresentationSevice] Use PresentationConnection to send messages from

content/renderer/presentation/presentation_dispatcher.cc

 // Copyright 2015 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 "content/renderer/presentation/presentation_dispatcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 517 matching lines @@
 void PresentationDispatcher::OnDefaultPresentationStarted(
     const PresentationInfo& presentation_info) {
   if (!controller_)
     return;
 
   auto* connection =
       controller_->DidStartDefaultPresentation(blink::WebPresentationInfo(
           presentation_info.presentation_url,
           blink::WebString::FromUTF8(presentation_info.presentation_id)));
 
-  if (connection) {
+  if (connection)
     SetControllerConnection(presentation_info, connection);
-    // Change blink connection state to 'connected' before listening to
-    // connection message. Remove ListenForConnectionMessage() after
-    // TODO(crbug.com/687011): use BrowserPresentationConnectionProxy to send
-    // message from route to blink connection.
-    presentation_service_->ListenForConnectionMessages(presentation_info);
-  }
 }
 
 void PresentationDispatcher::OnConnectionCreated(
     std::unique_ptr<blink::WebPresentationConnectionCallbacks> callback,
     const base::Optional<PresentationInfo>& presentation_info,
     const base::Optional<PresentationError>& error) {
   DCHECK(callback);
   if (error) {
     DCHECK(!presentation_info);
     callback->OnError(blink::WebPresentationError(
         GetWebPresentationErrorType(error->error_type),
         blink::WebString::FromUTF8(error->message)));
     return;
   }
 
   DCHECK(presentation_info);
   callback->OnSuccess(blink::WebPresentationInfo(
       presentation_info->presentation_url,
       blink::WebString::FromUTF8(presentation_info->presentation_id)));
-  // Change blink connection state to 'connected' before listening to
-  // connection message. Remove ListenForConnectionMessage() after
-  // TODO(crbug.com/687011): use BrowserPresentationConnectionProxy to send
-  // message from route to blink connection.
   SetControllerConnection(presentation_info.value(), callback->GetConnection());
-  presentation_service_->ListenForConnectionMessages(presentation_info.value());
 }
 
 void PresentationDispatcher::OnReceiverConnectionAvailable(
     const PresentationInfo& presentation_info,
     blink::mojom::PresentationConnectionPtr controller_connection_ptr,
     blink::mojom::PresentationConnectionRequest receiver_connection_request) {
   DCHECK(receiver_);
 
   // Bind receiver_connection_proxy with PresentationConnection in receiver
   // page.
@@ skipping 31 matching lines @@
     return;
 
   controller_->DidCloseConnection(
       blink::WebPresentationInfo(
           presentation_info.presentation_url,
           blink::WebString::FromUTF8(presentation_info.presentation_id)),
       GetWebPresentationConnectionCloseReason(reason),
       blink::WebString::FromUTF8(message));
 }
 
-void PresentationDispatcher::OnConnectionMessagesReceived(
-    const PresentationInfo& presentation_info,
-    std::vector<PresentationConnectionMessage> messages) {
-  if (!controller_)
-    return;
-
-  for (size_t i = 0; i < messages.size(); ++i) {
-    // Note: Passing batches of messages to the Blink layer would be more
-    // efficient.
-    auto web_presentation_info = blink::WebPresentationInfo(
-        presentation_info.presentation_url,
-        blink::WebString::FromUTF8(presentation_info.presentation_id));
-
-    if (messages[i].is_binary()) {
-      controller_->DidReceiveConnectionBinaryMessage(
-          web_presentation_info, &(messages[i].data->front()),
-          messages[i].data->size());
-    } else {
-      DCHECK(messages[i].message);
-      controller_->DidReceiveConnectionTextMessage(
-          web_presentation_info,
-          blink::WebString::FromUTF8(*messages[i].message));
-    }
-  }
-}
-
 void PresentationDispatcher::ConnectToPresentationServiceIfNeeded() {
   if (presentation_service_.get())
     return;
 
   render_frame()->GetRemoteInterfaces()->GetInterface(&presentation_service_);
   blink::mojom::PresentationServiceClientPtr client;
   binding_.Bind(mojo::MakeRequest(&client));
   presentation_service_->SetClient(std::move(client));
 }
 
@@ skipping 160 matching lines @@
 
 PresentationDispatcher::ListeningStatus::ListeningStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(blink::mojom::ScreenAvailability::UNKNOWN),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::ListeningStatus::~ListeningStatus() {}
 
 }  // namespace content