[Presentation API] Move presentation.mojom to content/common/presentation

content/browser/presentation/presentation_service_impl.cc

Index: content/browser/presentation/presentation_service_impl.cc
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc
index 9d870e3adf4c717129a36ad5d51f12538394c494..c8d211306672a5a537db0c1459c21b99e085964c 100644
--- a/content/browser/presentation/presentation_service_impl.cc
+++ b/content/browser/presentation/presentation_service_impl.cc
@@ -37,16 +37,16 @@ int GetNextRequestSessionId() {
 // |input|: The message to convert.
 // |pass_ownership|: If true, function may reuse strings or buffers from
 //     |input| without copying. |input| can be freely modified.
-blink::mojom::ConnectionMessagePtr ToMojoConnectionMessage(
+content::mojom::ConnectionMessagePtr ToMojoConnectionMessage(
     content::PresentationConnectionMessage* input,
     bool pass_ownership) {
   DCHECK(input);
-  blink::mojom::ConnectionMessagePtr output(
-      blink::mojom::ConnectionMessage::New());
+  content::mojom::ConnectionMessagePtr output(
+      content::mojom::ConnectionMessage::New());
   if (input->is_binary()) {
     // binary data
     DCHECK(input->data);
-    output->type = blink::mojom::PresentationMessageType::BINARY;
+    output->type = content::mojom::PresentationMessageType::BINARY;
     if (pass_ownership) {
       output->data = std::move(*(input->data));
     } else {
@@ -54,7 +54,7 @@ blink::mojom::ConnectionMessagePtr ToMojoConnectionMessage(
     }
   } else {
     // string message
-    output->type = blink::mojom::PresentationMessageType::TEXT;
+    output->type = content::mojom::PresentationMessageType::TEXT;
     if (pass_ownership) {
       output->message = std::move(input->message);
     } else {
@@ -65,13 +65,13 @@ blink::mojom::ConnectionMessagePtr ToMojoConnectionMessage(
 }
 
 std::unique_ptr<PresentationConnectionMessage> GetPresentationConnectionMessage(
-    blink::mojom::ConnectionMessagePtr input) {
+    content::mojom::ConnectionMessagePtr input) {
   std::unique_ptr<content::PresentationConnectionMessage> output;
   if (input.is_null())
     return output;
 
   switch (input->type) {
-    case blink::mojom::PresentationMessageType::TEXT: {
+    case content::mojom::PresentationMessageType::TEXT: {
       // Return nullptr PresentationConnectionMessage if invalid (unset
       // |message|,
       // set |data|, or size too large).
@@ -85,7 +85,7 @@ std::unique_ptr<PresentationConnectionMessage> GetPresentationConnectionMessage(
       output->message = std::move(input->message.value());
       return output;
     }
-    case blink::mojom::PresentationMessageType::BINARY: {
+    case content::mojom::PresentationMessageType::BINARY: {
       // Return nullptr PresentationConnectionMessage if invalid (unset |data|,
       // set
       // |message|, or size too large).
@@ -107,8 +107,8 @@ std::unique_ptr<PresentationConnectionMessage> GetPresentationConnectionMessage(
 
 void InvokeNewSessionCallbackWithError(
     const PresentationServiceImpl::NewSessionCallback& callback) {
-  callback.Run(blink::mojom::PresentationSessionInfoPtr(),
-               blink::mojom::PresentationError::From(PresentationError(
+  callback.Run(content::mojom::PresentationSessionInfoPtr(),
+               content::mojom::PresentationError::From(PresentationError(
                    PRESENTATION_ERROR_UNKNOWN, "Internal error")));
 }
 
@@ -148,7 +148,7 @@ PresentationServiceImpl::~PresentationServiceImpl() {
 // static
 void PresentationServiceImpl::CreateMojoService(
     RenderFrameHost* render_frame_host,
-    mojo::InterfaceRequest<blink::mojom::PresentationService> request) {
+    mojo::InterfaceRequest<content::mojom::PresentationService> request) {
   DVLOG(2) << "CreateMojoService";
   WebContents* web_contents =
       WebContents::FromRenderFrameHost(render_frame_host);
@@ -173,13 +173,13 @@ void PresentationServiceImpl::CreateMojoService(
 }
 
 void PresentationServiceImpl::Bind(
-    mojo::InterfaceRequest<blink::mojom::PresentationService> request) {
-  binding_.reset(new mojo::Binding<blink::mojom::PresentationService>(
+    mojo::InterfaceRequest<content::mojom::PresentationService> request) {
+  binding_.reset(new mojo::Binding<content::mojom::PresentationService>(
       this, std::move(request)));
 }
 
 void PresentationServiceImpl::SetClient(
-    blink::mojom::PresentationServiceClientPtr client) {
+    content::mojom::PresentationServiceClientPtr client) {
   DCHECK(!client_.get());
   // TODO(imcheng): Set ErrorHandler to listen for errors.
   client_ = std::move(client);
@@ -232,8 +232,8 @@ void PresentationServiceImpl::StartSession(
   DVLOG(2) << "StartSession";
   if (!controller_delegate_) {
     callback.Run(
-        blink::mojom::PresentationSessionInfoPtr(),
-        blink::mojom::PresentationError::From(PresentationError(
+        content::mojom::PresentationSessionInfoPtr(),
+        content::mojom::PresentationError::From(PresentationError(
             PRESENTATION_ERROR_NO_AVAILABLE_SCREENS, "No screens found.")));
     return;
   }
@@ -261,8 +261,8 @@ void PresentationServiceImpl::JoinSession(
     const NewSessionCallback& callback) {
   DVLOG(2) << "JoinSession";
   if (!controller_delegate_) {
-    callback.Run(blink::mojom::PresentationSessionInfoPtr(),
-                 blink::mojom::PresentationError::From(PresentationError(
+    callback.Run(content::mojom::PresentationSessionInfoPtr(),
+                 content::mojom::PresentationError::From(PresentationError(
                      PRESENTATION_ERROR_NO_PRESENTATION_FOUND,
                      "Error joining route: No matching route")));
     return;
@@ -314,8 +314,8 @@ void PresentationServiceImpl::OnStartSessionSucceeded(
 
   CHECK(pending_start_session_cb_.get());
   pending_start_session_cb_->Run(
-      blink::mojom::PresentationSessionInfo::From(session_info),
-      blink::mojom::PresentationErrorPtr());
+      content::mojom::PresentationSessionInfo::From(session_info),
+      content::mojom::PresentationErrorPtr());
   ListenForConnectionStateChangeAndChangeState(session_info);
   pending_start_session_cb_.reset();
   start_session_request_id_ = kInvalidRequestSessionId;
@@ -328,8 +328,9 @@ void PresentationServiceImpl::OnStartSessionError(
     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(
+      content::mojom::PresentationSessionInfoPtr(),
+      content::mojom::PresentationError::From(error));
   pending_start_session_cb_.reset();
   start_session_request_id_ = kInvalidRequestSessionId;
 }
@@ -339,8 +340,8 @@ void PresentationServiceImpl::OnJoinSessionSucceeded(
     const PresentationSessionInfo& session_info) {
   if (RunAndEraseJoinSessionMojoCallback(
           request_session_id,
-          blink::mojom::PresentationSessionInfo::From(session_info),
-          blink::mojom::PresentationErrorPtr())) {
+          content::mojom::PresentationSessionInfo::From(session_info),
+          content::mojom::PresentationErrorPtr())) {
     ListenForConnectionStateChangeAndChangeState(session_info);
   }
 }
@@ -349,14 +350,14 @@ void PresentationServiceImpl::OnJoinSessionError(
     int request_session_id,
     const PresentationError& error) {
   RunAndEraseJoinSessionMojoCallback(
-      request_session_id, blink::mojom::PresentationSessionInfoPtr(),
-      blink::mojom::PresentationError::From(error));
+      request_session_id, content::mojom::PresentationSessionInfoPtr(),
+      content::mojom::PresentationError::From(error));
 }
 
 bool PresentationServiceImpl::RunAndEraseJoinSessionMojoCallback(
     int request_session_id,
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::PresentationErrorPtr error) {
+    content::mojom::PresentationSessionInfoPtr session,
+    content::mojom::PresentationErrorPtr error) {
   auto it = pending_join_session_cbs_.find(request_session_id);
   if (it == pending_join_session_cbs_.end())
     return false;
@@ -384,8 +385,8 @@ void PresentationServiceImpl::SetDefaultPresentationUrls(
 }
 
 void PresentationServiceImpl::SendConnectionMessage(
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::ConnectionMessagePtr connection_message,
+    content::mojom::PresentationSessionInfoPtr session,
+    content::mojom::ConnectionMessagePtr connection_message,
     const SendConnectionMessageCallback& callback) {
   DVLOG(2) << "SendConnectionMessage"
            << " [id]: " << session->id;
@@ -441,12 +442,12 @@ void PresentationServiceImpl::OnConnectionStateChanged(
   DCHECK(client_.get());
   if (info.state == PRESENTATION_CONNECTION_STATE_CLOSED) {
     client_->OnConnectionClosed(
-        blink::mojom::PresentationSessionInfo::From(connection),
+        content::mojom::PresentationSessionInfo::From(connection),
         content::PresentationConnectionCloseReasonToMojo(info.close_reason),
         info.message);
   } else {
     client_->OnConnectionStateChanged(
-        blink::mojom::PresentationSessionInfo::From(connection),
+        content::mojom::PresentationSessionInfo::From(connection),
         PresentationConnectionStateToMojo(info.state));
   }
 }
@@ -468,7 +469,7 @@ PresentationServiceImpl::GetPresentationServiceDelegate() {
 }
 
 void PresentationServiceImpl::ListenForConnectionMessages(
-    blink::mojom::PresentationSessionInfoPtr session) {
+    content::mojom::PresentationSessionInfoPtr session) {
   DVLOG(2) << "ListenForConnectionMessages";
   if (!controller_delegate_)
     return;
@@ -481,9 +482,9 @@ void PresentationServiceImpl::ListenForConnectionMessages(
 }
 
 void PresentationServiceImpl::SetPresentationConnection(
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::PresentationConnectionPtr controller_connection_ptr,
-    blink::mojom::PresentationConnectionRequest receiver_connection_request) {
+    content::mojom::PresentationSessionInfoPtr session,
+    content::mojom::PresentationConnectionPtr controller_connection_ptr,
+    content::mojom::PresentationConnectionRequest receiver_connection_request) {
   DVLOG(2) << "SetPresentationConnection";
 
   if (!controller_delegate_)
@@ -504,7 +505,7 @@ void PresentationServiceImpl::OnConnectionMessages(
 
   DVLOG(2) << "OnConnectionMessages"
            << " [id]: " << session.presentation_id;
-  std::vector<blink::mojom::ConnectionMessagePtr> mojo_messages(
+  std::vector<content::mojom::ConnectionMessagePtr> mojo_messages(
       messages.size());
   std::transform(
       messages.begin(), messages.end(), mojo_messages.begin(),
@@ -514,7 +515,7 @@ void PresentationServiceImpl::OnConnectionMessages(
       });
 
   client_->OnConnectionMessagesReceived(
-      blink::mojom::PresentationSessionInfo::From(session),
+      content::mojom::PresentationSessionInfo::From(session),
       std::move(mojo_messages));
 }
 
@@ -525,7 +526,7 @@ void PresentationServiceImpl::OnReceiverConnectionAvailable(
   DVLOG(2) << "PresentationServiceImpl::OnReceiverConnectionAvailable";
 
   client_->OnReceiverConnectionAvailable(
-      blink::mojom::PresentationSessionInfo::From(session_info),
+      content::mojom::PresentationSessionInfo::From(session_info),
       std::move(controller_connection_ptr),
       std::move(receiver_connection_request));
 }
@@ -590,7 +591,7 @@ void PresentationServiceImpl::Reset() {
 
   if (on_connection_messages_callback_.get()) {
     on_connection_messages_callback_->Run(
-        std::vector<blink::mojom::ConnectionMessagePtr>());
+        std::vector<content::mojom::ConnectionMessagePtr>());
     on_connection_messages_callback_.reset();
   }
 
@@ -613,7 +614,7 @@ void PresentationServiceImpl::OnDefaultPresentationStarted(
     const PresentationSessionInfo& connection) {
   DCHECK(client_.get());
   client_->OnDefaultSessionStarted(
-      blink::mojom::PresentationSessionInfo::From(connection));
+      content::mojom::PresentationSessionInfo::From(connection));
   ListenForConnectionStateChangeAndChangeState(connection);
 }
 
@@ -656,8 +657,8 @@ PresentationServiceImpl::NewSessionCallbackWrapper
 }
 
 void PresentationServiceImpl::NewSessionCallbackWrapper::Run(
-    blink::mojom::PresentationSessionInfoPtr session,
-    blink::mojom::PresentationErrorPtr error) {
+    content::mojom::PresentationSessionInfoPtr session,
+    content::mojom::PresentationErrorPtr error) {
   DCHECK(!callback_.is_null());
   callback_.Run(std::move(session), std::move(error));
   callback_.Reset();