[Presentation API] Replaces type converters with typemaps

content/browser/presentation/presentation_service_impl.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/browser/presentation/presentation_service_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
-#include "content/browser/presentation/presentation_type_converters.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/presentation_connection_message.h"
 #include "content/public/common/presentation_constants.h"
 
@@ skipping 75 matching lines @@
       return output;
     }
   }
 
   NOTREACHED() << "Invalid presentation message type " << input->type;
   return output;
 }
 
 void InvokeNewSessionCallbackWithError(
     const PresentationServiceImpl::NewSessionCallback& callback) {
-  callback.Run(blink::mojom::PresentationSessionInfoPtr(),
-               blink::mojom::PresentationError::From(PresentationError(
+  callback.Run(base::nullopt,
+               PresentationError(
                    PRESENTATION_ERROR_PREVIOUS_START_IN_PROGRESS,
                    "There is already an unsettled Promise from a previous call "
-                   "to start.")));
+                   "to start."));
 }
 
 }  // namespace
 
 PresentationServiceImpl::PresentationServiceImpl(
     RenderFrameHost* render_frame_host,
     WebContents* web_contents,
     ControllerPresentationServiceDelegate* controller_delegate,
     ReceiverPresentationServiceDelegate* receiver_delegate)
     : WebContentsObserver(web_contents),
@@ skipping 101 matching lines @@
   controller_delegate_->RemoveScreenAvailabilityListener(
       render_process_id_, render_frame_id_, listener_it->second.get());
   screen_availability_listeners_.erase(listener_it);
 }
 
 void PresentationServiceImpl::StartSession(
     const std::vector<GURL>& presentation_urls,
     const NewSessionCallback& callback) {
   DVLOG(2) << "StartSession";
   if (!controller_delegate_) {
-    callback.Run(
-        blink::mojom::PresentationSessionInfoPtr(),
-        blink::mojom::PresentationError::From(PresentationError(
-            PRESENTATION_ERROR_NO_AVAILABLE_SCREENS, "No screens found.")));
+    callback.Run(base::nullopt,
+                 PresentationError(PRESENTATION_ERROR_NO_AVAILABLE_SCREENS,
+                                   "No screens found."));
     return;
   }
 
   // There is a StartSession request in progress. To avoid queueing up
   // requests, the incoming request is rejected.
   if (start_session_request_id_ != kInvalidRequestSessionId) {
     InvokeNewSessionCallbackWithError(callback);
     return;
   }
 
   start_session_request_id_ = GetNextRequestSessionId();
   pending_start_session_cb_.reset(new NewSessionCallbackWrapper(callback));
   controller_delegate_->StartSession(
       render_process_id_, render_frame_id_, presentation_urls,
       base::Bind(&PresentationServiceImpl::OnStartSessionSucceeded,
                  weak_factory_.GetWeakPtr(), start_session_request_id_),
       base::Bind(&PresentationServiceImpl::OnStartSessionError,
                  weak_factory_.GetWeakPtr(), start_session_request_id_));
 }
 
 void PresentationServiceImpl::JoinSession(
     const std::vector<GURL>& presentation_urls,
     const base::Optional<std::string>& presentation_id,
     const NewSessionCallback& callback) {
   DVLOG(2) << "JoinSession";
   if (!controller_delegate_) {
-    callback.Run(blink::mojom::PresentationSessionInfoPtr(),
-                 blink::mojom::PresentationError::From(PresentationError(
-                     PRESENTATION_ERROR_NO_PRESENTATION_FOUND,
-                     "Error joining route: No matching route")));
+    callback.Run(base::nullopt,
+                 PresentationError(PRESENTATION_ERROR_NO_PRESENTATION_FOUND,
+                                   "Error joining route: No matching route"));
     return;
   }
 
   int request_session_id = RegisterJoinSessionCallback(callback);
   if (request_session_id == kInvalidRequestSessionId) {
     InvokeNewSessionCallbackWithError(callback);
     return;
   }
   controller_delegate_->JoinSession(
       render_process_id_, render_frame_id_, presentation_urls,
@@ skipping 27 matching lines @@
   }
 }
 
 void PresentationServiceImpl::OnStartSessionSucceeded(
     int request_session_id,
     const PresentationSessionInfo& session_info) {
   if (request_session_id != start_session_request_id_)
     return;
 
   CHECK(pending_start_session_cb_.get());
-  pending_start_session_cb_->Run(
-      blink::mojom::PresentationSessionInfo::From(session_info),
-      blink::mojom::PresentationErrorPtr());
+  pending_start_session_cb_->Run(session_info, base::nullopt);
   ListenForConnectionStateChange(session_info);
   pending_start_session_cb_.reset();
   start_session_request_id_ = kInvalidRequestSessionId;
 }
 
 void PresentationServiceImpl::OnStartSessionError(
     int request_session_id,
     const PresentationError& error) {
   if (request_session_id != start_session_request_id_)
     return;
 
   CHECK(pending_start_session_cb_.get());
-  pending_start_session_cb_->Run(blink::mojom::PresentationSessionInfoPtr(),
-                                 blink::mojom::PresentationError::From(error));
+  pending_start_session_cb_->Run(base::nullopt, error);
   pending_start_session_cb_.reset();
   start_session_request_id_ = kInvalidRequestSessionId;
 }
 
 void PresentationServiceImpl::OnJoinSessionSucceeded(
     int request_session_id,
     const PresentationSessionInfo& session_info) {
-  if (RunAndEraseJoinSessionMojoCallback(
-          request_session_id,
-          blink::mojom::PresentationSessionInfo::From(session_info),
-          blink::mojom::PresentationErrorPtr())) {
+  if (RunAndEraseJoinSessionMojoCallback(request_session_id, session_info,
+                                         base::nullopt)) {
     ListenForConnectionStateChange(session_info);
   }
 }
 
 void PresentationServiceImpl::OnJoinSessionError(
     int request_session_id,
     const PresentationError& error) {
-  RunAndEraseJoinSessionMojoCallback(
-      request_session_id, blink::mojom::PresentationSessionInfoPtr(),
-      blink::mojom::PresentationError::From(error));
+  RunAndEraseJoinSessionMojoCallback(request_session_id, base::nullopt, error);
 }
 
 bool PresentationServiceImpl::RunAndEraseJoinSessionMojoCallback(
     int request_session_id,
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::PresentationErrorPtr error) {
+    const base::Optional<PresentationSessionInfo>& session_info,
+    const base::Optional<PresentationError>& error) {
   auto it = pending_join_session_cbs_.find(request_session_id);
   if (it == pending_join_session_cbs_.end())
     return false;
 
   DCHECK(it->second.get());
-  it->second->Run(std::move(session), std::move(error));
+  it->second->Run(session_info, error);
   pending_join_session_cbs_.erase(it);
   return true;
 }
 
 void PresentationServiceImpl::SetDefaultPresentationUrls(
     const std::vector<GURL>& presentation_urls) {
   DVLOG(2) << "SetDefaultPresentationUrls";
   if (!controller_delegate_)
     return;
 
   if (default_presentation_urls_ == presentation_urls)
     return;
 
   default_presentation_urls_ = presentation_urls;
   controller_delegate_->SetDefaultPresentationUrls(
       render_process_id_, render_frame_id_, presentation_urls,
       base::Bind(&PresentationServiceImpl::OnDefaultPresentationStarted,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PresentationServiceImpl::SendConnectionMessage(
-    blink::mojom::PresentationSessionInfoPtr session,
+    const PresentationSessionInfo& session_info,
     blink::mojom::ConnectionMessagePtr connection_message,
     const SendConnectionMessageCallback& callback) {
-  DVLOG(2) << "SendConnectionMessage"
-           << " [id]: " << session->id;
+  DVLOG(2) << "SendConnectionMessage [id]: " << session_info.presentation_id;
   DCHECK(!connection_message.is_null());
   // send_message_callback_ should be null by now, otherwise resetting of
   // send_message_callback_ with new callback will drop the old callback.
   if (!controller_delegate_ || send_message_callback_) {
     callback.Run(false);
     return;
   }
 
   send_message_callback_.reset(new SendConnectionMessageCallback(callback));
   controller_delegate_->SendMessage(
-      render_process_id_, render_frame_id_,
-      session.To<PresentationSessionInfo>(),
+      render_process_id_, render_frame_id_, session_info,
       GetPresentationConnectionMessage(std::move(connection_message)),
       base::Bind(&PresentationServiceImpl::OnSendMessageCallback,
                  weak_factory_.GetWeakPtr()));
 }
 
 void PresentationServiceImpl::OnSendMessageCallback(bool sent) {
   // It is possible that Reset() is invoked before receiving this callback.
   // So, always check send_message_callback_ for non-null.
   if (send_message_callback_) {
     send_message_callback_->Run(sent);
@@ skipping 19 matching lines @@
 }
 
 void PresentationServiceImpl::OnConnectionStateChanged(
     const PresentationSessionInfo& connection,
     const PresentationConnectionStateChangeInfo& info) {
   DVLOG(2) << "PresentationServiceImpl::OnConnectionStateChanged "
            << "[presentation_id]: " << connection.presentation_id
            << " [state]: " << info.state;
   DCHECK(client_.get());
   if (info.state == PRESENTATION_CONNECTION_STATE_CLOSED) {
-    client_->OnConnectionClosed(
-        blink::mojom::PresentationSessionInfo::From(connection),
-        content::PresentationConnectionCloseReasonToMojo(info.close_reason),
-        info.message);
+    client_->OnConnectionClosed(connection, info.close_reason, info.message);
   } else {
-    client_->OnConnectionStateChanged(
-        blink::mojom::PresentationSessionInfo::From(connection),
-        PresentationConnectionStateToMojo(info.state));
+    client_->OnConnectionStateChanged(connection, info.state);
   }
 }
 
 bool PresentationServiceImpl::FrameMatches(
     content::RenderFrameHost* render_frame_host) const {
   if (!render_frame_host)
     return false;
 
   return render_frame_host->GetProcess()->GetID() == render_process_id_ &&
          render_frame_host->GetRoutingID() == render_frame_id_;
 }
 
 PresentationServiceDelegate*
 PresentationServiceImpl::GetPresentationServiceDelegate() {
   return receiver_delegate_
              ? static_cast<PresentationServiceDelegate*>(receiver_delegate_)
              : static_cast<PresentationServiceDelegate*>(controller_delegate_);
 }
 
 void PresentationServiceImpl::ListenForConnectionMessages(
-    blink::mojom::PresentationSessionInfoPtr session) {
+    const PresentationSessionInfo& session_info) {
   DVLOG(2) << "ListenForConnectionMessages";
   if (!controller_delegate_)
     return;
 
-  PresentationSessionInfo session_info(session.To<PresentationSessionInfo>());
   controller_delegate_->ListenForConnectionMessages(
       render_process_id_, render_frame_id_, session_info,
       base::Bind(&PresentationServiceImpl::OnConnectionMessages,
                  weak_factory_.GetWeakPtr(), session_info));
 }
 
 void PresentationServiceImpl::SetPresentationConnection(
-    blink::mojom::PresentationSessionInfoPtr session,
+    const PresentationSessionInfo& session_info,
     blink::mojom::PresentationConnectionPtr controller_connection_ptr,
     blink::mojom::PresentationConnectionRequest receiver_connection_request) {
   DVLOG(2) << "SetPresentationConnection";
 
   if (!controller_delegate_)
     return;
 
-  PresentationSessionInfo session_info(session.To<PresentationSessionInfo>());
   controller_delegate_->ConnectToOffscreenPresentation(
       render_process_id_, render_frame_id_, session_info,
       std::move(controller_connection_ptr),
       std::move(receiver_connection_request));
 }
 
 void PresentationServiceImpl::OnConnectionMessages(
-    const PresentationSessionInfo& session,
+    const PresentationSessionInfo& session_info,
     const std::vector<std::unique_ptr<PresentationConnectionMessage>>& messages,
     bool pass_ownership) {
   DCHECK(client_);
 
-  DVLOG(2) << "OnConnectionMessages"
-           << " [id]: " << session.presentation_id;
+  DVLOG(2) << "OnConnectionMessages [id]: " << session_info.presentation_id;
   std::vector<blink::mojom::ConnectionMessagePtr> mojo_messages(
       messages.size());
   std::transform(
       messages.begin(), messages.end(), mojo_messages.begin(),
       [pass_ownership](
           const std::unique_ptr<PresentationConnectionMessage>& message) {
         return ToMojoConnectionMessage(message.get(), pass_ownership);
       });
 
-  client_->OnConnectionMessagesReceived(
-      blink::mojom::PresentationSessionInfo::From(session),
-      std::move(mojo_messages));
+  client_->OnConnectionMessagesReceived(session_info, std::move(mojo_messages));
 }
 
 void PresentationServiceImpl::OnReceiverConnectionAvailable(
     const content::PresentationSessionInfo& session_info,
     PresentationConnectionPtr controller_connection_ptr,
     PresentationConnectionRequest receiver_connection_request) {
   DVLOG(2) << "PresentationServiceImpl::OnReceiverConnectionAvailable";
 
   client_->OnReceiverConnectionAvailable(
-      blink::mojom::PresentationSessionInfo::From(session_info),
-      std::move(controller_connection_ptr),
+      session_info, std::move(controller_connection_ptr),
       std::move(receiver_connection_request));
 }
 
 void PresentationServiceImpl::DidNavigateAnyFrame(
     content::RenderFrameHost* render_frame_host,
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   DVLOG(2) << "PresentationServiceImpl::DidNavigateAnyFrame";
   if (!FrameMatches(render_frame_host))
     return;
@@ skipping 65 matching lines @@
 void PresentationServiceImpl::OnDelegateDestroyed() {
   DVLOG(2) << "PresentationServiceImpl::OnDelegateDestroyed";
   controller_delegate_ = nullptr;
   receiver_delegate_ = nullptr;
   Reset();
 }
 
 void PresentationServiceImpl::OnDefaultPresentationStarted(
     const PresentationSessionInfo& connection) {
   DCHECK(client_.get());
-  client_->OnDefaultSessionStarted(
-      blink::mojom::PresentationSessionInfo::From(connection));
+  client_->OnDefaultSessionStarted(connection);
   ListenForConnectionStateChange(connection);
 }
 
 PresentationServiceImpl::ScreenAvailabilityListenerImpl::
     ScreenAvailabilityListenerImpl(const GURL& availability_url,
                                    PresentationServiceImpl* service)
     : availability_url_(availability_url), service_(service) {
   DCHECK(service_);
   DCHECK(service_->client_.get());
 }
@@ skipping 22 matching lines @@
     : callback_(callback) {
 }
 
 PresentationServiceImpl::NewSessionCallbackWrapper
 ::~NewSessionCallbackWrapper() {
   if (!callback_.is_null())
     InvokeNewSessionCallbackWithError(callback_);
 }
 
 void PresentationServiceImpl::NewSessionCallbackWrapper::Run(
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::PresentationErrorPtr error) {
+    const base::Optional<PresentationSessionInfo>& session_info,
+    const base::Optional<PresentationError>& error) {
   DCHECK(!callback_.is_null());
-  callback_.Run(std::move(session), std::move(error));
+  callback_.Run(session_info, error);
   callback_.Reset();
 }
 
 }  // namespace content