Revert of [Presentation API] (5th) (1-UA) integrate controller and receiver side for 1-UA messaging

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 196 matching lines @@
   message_request_queue_.push(base::WrapUnique(CreateSendBinaryMessageRequest(
       presentationUrl, presentationId,
       blink::mojom::PresentationMessageType::BINARY, data, length,
       connection_proxy)));
   // Start processing request if only one in the queue.
   if (message_request_queue_.size() == 1)
     DoSendMessage(message_request_queue_.front().get());
 }
 
 void PresentationDispatcher::DoSendMessage(SendMessageRequest* request) {
-  DCHECK(request->connection_proxy);
-  // TODO(crbug.com/684116): Remove static_cast after moving message queue logic
-  // from PresentationDispatcher to PresentationConnectionProxy.
-  static_cast<const PresentationConnectionProxy*>(request->connection_proxy)
-      ->SendConnectionMessage(
-          std::move(request->message),
-          base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
-                     base::Unretained(this)));
+  ConnectToPresentationServiceIfNeeded();
+
+  presentation_service_->SendConnectionMessage(
+      std::move(request->session_info), std::move(request->message),
+      base::Bind(&PresentationDispatcher::HandleSendMessageRequests,
+                 base::Unretained(this)));
 }
 
 void PresentationDispatcher::HandleSendMessageRequests(bool success) {
   // In normal cases, message_request_queue_ should not be empty at this point
   // of time, but when DidCommitProvisionalLoad() is invoked before receiving
   // the callback for previous send mojo call, queue would have been emptied.
   if (message_request_queue_.empty())
     return;
 
   if (!success) {
     // PresentationServiceImpl is informing that Frame has been detached or
     // navigated away. Invalidate all pending requests.
     MessageRequestQueue empty;
     std::swap(message_request_queue_, empty);
     return;
   }
 
   message_request_queue_.pop();
   if (!message_request_queue_.empty()) {
     DoSendMessage(message_request_queue_.front().get());
   }
 }
 
-void PresentationDispatcher::SetControllerConnection(
-    const PresentationSessionInfo& session_info,
-    blink::WebPresentationConnection* connection) {
-  DCHECK(connection);
-
-  auto* controller_connection_proxy = new ControllerConnectionProxy(connection);
-  connection->bindProxy(base::WrapUnique(controller_connection_proxy));
-
-  ConnectToPresentationServiceIfNeeded();
-  presentation_service_->SetPresentationConnection(
-      session_info, controller_connection_proxy->Bind(),
-      controller_connection_proxy->MakeRemoteRequest());
-}
-
 void PresentationDispatcher::closeSession(
     const blink::WebURL& presentationUrl,
     const blink::WebString& presentationId) {
   ConnectToPresentationServiceIfNeeded();
   presentation_service_->CloseConnection(presentationUrl,
                                          presentationId.utf8());
 }
 
 void PresentationDispatcher::terminateSession(
     const blink::WebURL& presentationUrl,
@@ skipping 211 matching lines @@
 
   for (auto* listener : modified_listeners)
     TryRemoveAvailabilityListener(listener);
 }
 
 void PresentationDispatcher::OnDefaultSessionStarted(
     const PresentationSessionInfo& session_info) {
   if (!controller_)
     return;
 
+  presentation_service_->ListenForConnectionMessages(session_info);
   auto* connection =
       controller_->didStartDefaultSession(blink::WebPresentationSessionInfo(
           session_info.presentation_url,
           blink::WebString::fromUTF8(session_info.presentation_id)));
-
-  if (connection) {
-    SetControllerConnection(session_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(session_info);
-  }
+  connection->bindProxy(
+      base::MakeUnique<ControllerConnectionProxy>(connection));
 }
 
 void PresentationDispatcher::OnSessionCreated(
     std::unique_ptr<blink::WebPresentationConnectionCallbacks> callback,
     const base::Optional<PresentationSessionInfo>& session_info,
     const base::Optional<PresentationError>& error) {
   DCHECK(callback);
   if (error) {
     DCHECK(!session_info);
     callback->onError(blink::WebPresentationError(
         GetWebPresentationErrorType(error->error_type),
         blink::WebString::fromUTF8(error->message)));
     return;
   }
 
   DCHECK(session_info);
+  presentation_service_->ListenForConnectionMessages(session_info.value());
   callback->onSuccess(blink::WebPresentationSessionInfo(
       session_info->presentation_url,
       blink::WebString::fromUTF8(session_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(session_info.value(), callback->getConnection());
-  presentation_service_->ListenForConnectionMessages(session_info.value());
+
+  auto* connection = callback->getConnection();
+  connection->bindProxy(
+      base::MakeUnique<ControllerConnectionProxy>(connection));
 }
 
 void PresentationDispatcher::OnReceiverConnectionAvailable(
     const PresentationSessionInfo& session_info,
     blink::mojom::PresentationConnectionPtr controller_connection_ptr,
     blink::mojom::PresentationConnectionRequest receiver_connection_request) {
   DCHECK(receiver_);
-
   // Bind receiver_connection_proxy with PresentationConnection in receiver
   // page.
   auto* connection = receiver_->onReceiverConnectionAvailable(
       blink::WebPresentationSessionInfo(
           session_info.presentation_url,
           blink::WebString::fromUTF8(session_info.presentation_id)));
   auto* receiver_connection_proxy = new ReceiverConnectionProxy(connection);
   connection->bindProxy(base::WrapUnique(receiver_connection_proxy));
 
   receiver_connection_proxy->Bind(std::move(receiver_connection_request));
@@ skipping 228 matching lines @@
 
 PresentationDispatcher::ListeningStatus::ListeningStatus(
     const GURL& availability_url)
     : url(availability_url),
       last_known_availability(ScreenAvailability::UNKNOWN),
       listening_state(ListeningState::INACTIVE) {}
 
 PresentationDispatcher::ListeningStatus::~ListeningStatus() {}
 
 }  // namespace content