Reland of [Presentation API] Convert presentation.mojom to new wrapper types....

Reland of [Presentation API] Convert presentation.mojom to new wrapper types. (patchset #1 id:1 of https://codereview.chromium.org/2196143002/ )

Reason for revert:
Didn't work. NaCl still crashing. Sadness :(

Original issue's description:
> Revert of [Presentation API] Convert presentation.mojom to new wrapper types. (patchset #5 id:80001 of https://codereview.chromium.org/2181163003/ )
>
> Reason for revert:
> Suspect (not the first) for widespread NaCl test failures since
> https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/55504
>
> Errors like
>
> [4224:3200:0729/162247:ERROR:nacl_process_host.cc(337)] NaCl process exited with status -1073741674 (0xc0000096)
> ...
>   Actual: "Plugin crashed. 'NaCl module crashed'"
>
> Wasn't r408782 or r408787. Running out of candidates..
>
> Original issue's description:
> > [Presentation API] Convert presentation.mojom to new wrapper types.
> >
> > This converts presentation.mojom to use the new (std::) Mojo wrapper types:
> > mojo::String => std::string
> > mojo::Array => std::vector
> >
> > No behavior changes should ensue.
> >
> > Optional values are represented as base::Optional<Foo> with the new wrapper
> > types requiring some additional changes.
> >
> > This work will simplify further changes for crbug.com/627655.
> >
> > BUG=627655
> >
> > Committed: https://crrev.com/59e7b40948030815a49af887b922b370ba048b8b
> > Cr-Commit-Position: refs/heads/master@{#408781}
>
> TBR=dcheng@chromium.org,imcheng@chromium.org,mfoltz@chromium.org
> NOTRY=true
> BUG=627655
>
> Committed: https://crrev.com/43c746be32b2bfce5c3fd654894e4b7f7bf6387f
> Cr-Commit-Position: refs/heads/master@{#408905}

TBR=dcheng@chromium.org,imcheng@chromium.org,mfoltz@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=627655

Review-Url: https://codereview.chromium.org/2197053002
Cr-Commit-Position: refs/heads/master@{#408910}

content/browser/presentation/presentation_service_impl.cc

@@ -49,15 +49,15 @@ blink::mojom::SessionMessagePtr ToMojoSessionMessage(
     DCHECK(input->data);
     output->type = blink::mojom::PresentationMessageType::ARRAY_BUFFER;
     if (pass_ownership) {
-      output->data.Swap(input->data.get());
+      output->data = std::move(*(input->data));
     } else {
-      output->data = mojo::Array<uint8_t>::From(*input->data);
+      output->data = *(input->data);
     }
   } else {
     // string message
     output->type = blink::mojom::PresentationMessageType::TEXT;
     if (pass_ownership) {
-      output->message.Swap(&input->message);
+      output->message = std::move(input->message);
     } else {
       output->message = input->message;
     }
@@ -67,43 +67,47 @@ blink::mojom::SessionMessagePtr ToMojoSessionMessage(
 
 std::unique_ptr<PresentationSessionMessage> GetPresentationSessionMessage(
     blink::mojom::SessionMessagePtr input) {
-  DCHECK(!input.is_null());
   std::unique_ptr<content::PresentationSessionMessage> output;
+  if (input.is_null())
+    return output;
+
   switch (input->type) {
     case blink::mojom::PresentationMessageType::TEXT: {
-      DCHECK(!input->message.is_null());
-      DCHECK(input->data.is_null());
-      // Return null PresentationSessionMessage if size exceeds.
-      if (input->message.size() > content::kMaxPresentationSessionMessageSize)
+      // Return nullptr PresentationSessionMessage if invalid (unset |message|,
+      // set |data|, or size too large).
+      if (input->data || !input->message ||
+          input->message->size() > content::kMaxPresentationSessionMessageSize)
         return output;
 
       output.reset(
           new PresentationSessionMessage(PresentationMessageType::TEXT));
-      input->message.Swap(&output->message);
+      output->message = std::move(input->message.value());
       return output;
     }
     case blink::mojom::PresentationMessageType::ARRAY_BUFFER: {
-      DCHECK(!input->data.is_null());
-      DCHECK(input->message.is_null());
-      if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+      // Return nullptr PresentationSessionMessage if invalid (unset |data|, set
+      // |message|, or size too large).
+      if (!input->data || input->message ||
+          input->data->size() > content::kMaxPresentationSessionMessageSize)
         return output;
 
       output.reset(new PresentationSessionMessage(
           PresentationMessageType::ARRAY_BUFFER));
-      output->data.reset(new std::vector<uint8_t>);
-      input->data.Swap(output->data.get());
+      output->data.reset(
+          new std::vector<uint8_t>(std::move(input->data.value())));
       return output;
     }
     case blink::mojom::PresentationMessageType::BLOB: {
-      DCHECK(!input->data.is_null());
-      DCHECK(input->message.is_null());
-      if (input->data.size() > content::kMaxPresentationSessionMessageSize)
+      // Return nullptr PresentationSessionMessage if invalid (unset |data|, set
+      // |message|, or size too large).
+      if (!input->data || input->message ||
+          input->data->size() > content::kMaxPresentationSessionMessageSize)
         return output;
 
       output.reset(
           new PresentationSessionMessage(PresentationMessageType::BLOB));
-      output->data.reset(new std::vector<uint8_t>);
-      input->data.Swap(output->data.get());
+      output->data.reset(
+          new std::vector<uint8_t>(std::move(input->data.value())));
       return output;
     }
   }
@@ -179,37 +183,35 @@ void PresentationServiceImpl::SetClient(
 }
 
 void PresentationServiceImpl::ListenForScreenAvailability(
-      const mojo::String& url) {
+    const std::string& url) {
   DVLOG(2) << "ListenForScreenAvailability " << url;
   if (!delegate_) {
     client_->OnScreenAvailabilityUpdated(url, false);
     return;
   }
 
-  const std::string& availability_url = url.get();
-  if (screen_availability_listeners_.count(availability_url))
+  if (screen_availability_listeners_.count(url))
     return;
 
   std::unique_ptr<ScreenAvailabilityListenerImpl> listener(
-      new ScreenAvailabilityListenerImpl(availability_url, this));
+      new ScreenAvailabilityListenerImpl(url, this));
   if (delegate_->AddScreenAvailabilityListener(
       render_process_id_,
       render_frame_id_,
       listener.get())) {
-    screen_availability_listeners_[availability_url] = std::move(listener);
+    screen_availability_listeners_[url] = std::move(listener);
   } else {
     DVLOG(1) << "AddScreenAvailabilityListener failed. Ignoring request.";
   }
 }
 
 void PresentationServiceImpl::StopListeningForScreenAvailability(
-    const mojo::String& url) {
+    const std::string& url) {
   DVLOG(2) << "StopListeningForScreenAvailability " << url;
   if (!delegate_)
     return;
 
-  const std::string& availability_url = url.get();
-  auto listener_it = screen_availability_listeners_.find(availability_url);
+  auto listener_it = screen_availability_listeners_.find(url);
   if (listener_it == screen_availability_listeners_.end())
     return;
 
@@ -218,7 +220,7 @@ void PresentationServiceImpl::StopListeningForScreenAvailability(
   screen_availability_listeners_.erase(listener_it);
 }
 
-void PresentationServiceImpl::StartSession(const mojo::String& presentation_url,
+void PresentationServiceImpl::StartSession(const std::string& presentation_url,
                                            const NewSessionCallback& callback) {
   DVLOG(2) << "StartSession";
   if (!delegate_) {
@@ -247,8 +249,8 @@ void PresentationServiceImpl::StartSession(const mojo::String& presentation_url,
 }
 
 void PresentationServiceImpl::JoinSession(
-    const mojo::String& presentation_url,
-    const mojo::String& presentation_id,
+    const std::string& presentation_url,
+    const base::Optional<std::string>& presentation_id,
     const NewSessionCallback& callback) {
   DVLOG(2) << "JoinSession";
   if (!delegate_) {
@@ -265,10 +267,8 @@ void PresentationServiceImpl::JoinSession(
     return;
   }
   delegate_->JoinSession(
-      render_process_id_,
-      render_frame_id_,
-      presentation_url,
-      presentation_id,
+      render_process_id_, render_frame_id_, presentation_url,
+      presentation_id.value_or(std::string()),
       base::Bind(&PresentationServiceImpl::OnJoinSessionSucceeded,
                  weak_factory_.GetWeakPtr(), request_session_id),
       base::Bind(&PresentationServiceImpl::OnJoinSessionError,
@@ -358,18 +358,17 @@ bool PresentationServiceImpl::RunAndEraseJoinSessionMojoCallback(
 }
 
 void PresentationServiceImpl::SetDefaultPresentationURL(
-    const mojo::String& url) {
+    const std::string& url) {
   DVLOG(2) << "SetDefaultPresentationURL";
   if (!delegate_)
     return;
 
-  const std::string& new_default_url = url.get();
-  if (default_presentation_url_ == new_default_url)
+  if (default_presentation_url_ == url)
     return;
 
-  default_presentation_url_ = new_default_url;
+  default_presentation_url_ = url;
   delegate_->SetDefaultPresentationUrl(
-      render_process_id_, render_frame_id_, new_default_url,
+      render_process_id_, render_frame_id_, url,
       base::Bind(&PresentationServiceImpl::OnDefaultPresentationStarted,
                  weak_factory_.GetWeakPtr()));
 }
@@ -406,16 +405,16 @@ void PresentationServiceImpl::OnSendMessageCallback(bool sent) {
 }
 
 void PresentationServiceImpl::CloseConnection(
-    const mojo::String& presentation_url,
-    const mojo::String& presentation_id) {
+    const std::string& presentation_url,
+    const std::string& presentation_id) {
   DVLOG(2) << "CloseConnection " << presentation_id;
   if (delegate_)
     delegate_->CloseConnection(render_process_id_, render_frame_id_,
                                presentation_id);
 }
 
-void PresentationServiceImpl::Terminate(const mojo::String& presentation_url,
-                                        const mojo::String& presentation_id) {
+void PresentationServiceImpl::Terminate(const std::string& presentation_url,
+                                        const std::string& presentation_id) {
   DVLOG(2) << "Terminate " << presentation_id;
   if (delegate_)
     delegate_->Terminate(render_process_id_, render_frame_id_, presentation_id);
@@ -466,13 +465,15 @@ void PresentationServiceImpl::OnSessionMessages(
   DCHECK(client_);
 
   DVLOG(2) << "OnSessionMessages";
-  mojo::Array<blink::mojom::SessionMessagePtr> mojoMessages(messages.size());
-  for (size_t i = 0; i < messages.size(); ++i)
-    mojoMessages[i] = ToMojoSessionMessage(messages[i], pass_ownership);
+  std::vector<blink::mojom::SessionMessagePtr> mojo_messages(messages.size());
+  std::transform(messages.begin(), messages.end(), mojo_messages.begin(),
+                 [pass_ownership](PresentationSessionMessage* message) {
+                   return ToMojoSessionMessage(message, pass_ownership);
+                 });
 
   client_->OnSessionMessagesReceived(
       blink::mojom::PresentationSessionInfo::From(session),
-      std::move(mojoMessages));
+      std::move(mojo_messages));
 }
 
 void PresentationServiceImpl::DidNavigateAnyFrame(

content/browser/presentation/presentation_service_impl.h

@@ -18,6 +18,7 @@
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
+#include "base/optional.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/presentation_screen_availability_listener.h"
@@ -149,24 +150,22 @@ class CONTENT_EXPORT PresentationServiceImpl
       PresentationServiceDelegate* delegate);
 
   // PresentationService implementation.
-  void SetDefaultPresentationURL(const mojo::String& url) override;
+  void SetDefaultPresentationURL(const std::string& url) override;
   void SetClient(blink::mojom::PresentationServiceClientPtr client) override;
-  void ListenForScreenAvailability(const mojo::String& url) override;
-  void StopListeningForScreenAvailability(const mojo::String& url) override;
-  void StartSession(
-      const mojo::String& presentation_url,
+  void ListenForScreenAvailability(const std::string& url) override;
+  void StopListeningForScreenAvailability(const std::string& url) override;
+  void StartSession(const std::string& presentation_url,
                     const NewSessionCallback& callback) override;
-  void JoinSession(
-      const mojo::String& presentation_url,
-      const mojo::String& presentation_id,
+  void JoinSession(const std::string& presentation_url,
+                   const base::Optional<std::string>& presentation_id,
                    const NewSessionCallback& callback) override;
   void SendSessionMessage(blink::mojom::PresentationSessionInfoPtr session_info,
                           blink::mojom::SessionMessagePtr session_message,
                           const SendSessionMessageCallback& callback) override;
-  void CloseConnection(const mojo::String& presentation_url,
-                       const mojo::String& presentation_id) override;
-  void Terminate(const mojo::String& presentation_url,
-                 const mojo::String& presentation_id) override;
+  void CloseConnection(const std::string& presentation_url,
+                       const std::string& presentation_id) override;
+  void Terminate(const std::string& presentation_url,
+                 const std::string& presentation_id) override;
   void ListenForSessionMessages(
       blink::mojom::PresentationSessionInfoPtr session) override;
 

content/browser/presentation/presentation_service_impl_unittest.cc

@@ -46,14 +46,6 @@ MATCHER_P(Equals, expected, "") {
 const char *const kPresentationId = "presentationId";
 const char *const kPresentationUrl = "http://foo.com/index.html";
 
-bool ArePresentationSessionMessagesEqual(
-    const blink::mojom::SessionMessage* expected,
-    const blink::mojom::SessionMessage* actual) {
-  return expected->type == actual->type &&
-         expected->message == actual->message &&
-         expected->data.Equals(actual->data);
-}
-
 void DoNothing(blink::mojom::PresentationSessionInfoPtr info,
                blink::mojom::PresentationErrorPtr error) {}
 
@@ -152,7 +144,7 @@ class MockPresentationServiceClient
     : public blink::mojom::PresentationServiceClient {
  public:
   MOCK_METHOD2(OnScreenAvailabilityUpdated,
-      void(const mojo::String& url, bool available));
+               void(const std::string& url, bool available));
   void OnConnectionStateChanged(
       blink::mojom::PresentationSessionInfoPtr connection,
       blink::mojom::PresentationConnectionState new_state) override {
@@ -165,19 +157,19 @@ class MockPresentationServiceClient
   void OnConnectionClosed(
       blink::mojom::PresentationSessionInfoPtr connection,
       blink::mojom::PresentationConnectionCloseReason reason,
-      const mojo::String& message) override {
+      const std::string& message) override {
     OnConnectionClosed(*connection, reason, message);
   }
   MOCK_METHOD3(OnConnectionClosed,
                void(const blink::mojom::PresentationSessionInfo& connection,
                     blink::mojom::PresentationConnectionCloseReason reason,
-                    const mojo::String& message));
+                    const std::string& message));
 
-  MOCK_METHOD1(OnScreenAvailabilityNotSupported, void(const mojo::String& url));
+  MOCK_METHOD1(OnScreenAvailabilityNotSupported, void(const std::string& url));
 
   void OnSessionMessagesReceived(
       blink::mojom::PresentationSessionInfoPtr session_info,
-      mojo::Array<blink::mojom::SessionMessagePtr> messages) override {
+      std::vector<blink::mojom::SessionMessagePtr> messages) override {
     messages_received_ = std::move(messages);
     MessagesReceived();
   }
@@ -190,7 +182,7 @@ class MockPresentationServiceClient
   MOCK_METHOD1(OnDefaultSessionStarted,
                void(const blink::mojom::PresentationSessionInfo& session_info));
 
-  mojo::Array<blink::mojom::SessionMessagePtr> messages_received_;
+  std::vector<blink::mojom::SessionMessagePtr> messages_received_;
 };
 
 class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
@@ -224,8 +216,8 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
     RenderViewHostImplTestHarness::TearDown();
   }
 
-  void ListenForScreenAvailabilityAndWait(
-      const mojo::String& url, bool delegate_success) {
+  void ListenForScreenAvailabilityAndWait(const std::string& url,
+                                          bool delegate_success) {
     base::RunLoop run_loop;
     // This will call to |service_impl_| via mojo. Process the message
     // using RunLoop.
@@ -261,8 +253,7 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
     ASSERT_TRUE(listener_it->second);
 
     base::RunLoop run_loop;
-    EXPECT_CALL(mock_client_,
-                OnScreenAvailabilityUpdated(mojo::String(url), available))
+    EXPECT_CALL(mock_client_, OnScreenAvailabilityUpdated(url, available))
         .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
     listener_it->second->OnScreenAvailabilityChanged(available);
     run_loop.Run();
@@ -299,13 +290,11 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
   }
 
   void ExpectSessionMessages(
-      const mojo::Array<blink::mojom::SessionMessagePtr>& expected_msgs,
-      const mojo::Array<blink::mojom::SessionMessagePtr>& actual_msgs) {
+      const std::vector<blink::mojom::SessionMessagePtr>& expected_msgs,
+      const std::vector<blink::mojom::SessionMessagePtr>& actual_msgs) {
     EXPECT_EQ(expected_msgs.size(), actual_msgs.size());
-    for (size_t i = 0; i < actual_msgs.size(); ++i) {
-      EXPECT_TRUE(ArePresentationSessionMessagesEqual(expected_msgs[i].get(),
-                                                      actual_msgs[i].get()));
-    }
+    for (size_t i = 0; i < actual_msgs.size(); ++i)
+      EXPECT_TRUE(expected_msgs[i].Equals(actual_msgs[i]));
   }
 
   void ExpectSendSessionMessageCallback(bool success) {
@@ -318,14 +307,14 @@ class PresentationServiceImplTest : public RenderViewHostImplTestHarness {
   void RunListenForSessionMessages(const std::string& text_msg,
                                    const std::vector<uint8_t>& binary_data,
                                    bool pass_ownership) {
-    mojo::Array<blink::mojom::SessionMessagePtr> expected_msgs(2);
+    std::vector<blink::mojom::SessionMessagePtr> expected_msgs(2);
     expected_msgs[0] = blink::mojom::SessionMessage::New();
     expected_msgs[0]->type = blink::mojom::PresentationMessageType::TEXT;
     expected_msgs[0]->message = text_msg;
     expected_msgs[1] = blink::mojom::SessionMessage::New();
     expected_msgs[1]->type =
         blink::mojom::PresentationMessageType::ARRAY_BUFFER;
-    expected_msgs[1]->data = mojo::Array<uint8_t>::From(binary_data);
+    expected_msgs[1]->data = binary_data;
 
     blink::mojom::PresentationSessionInfoPtr session(
         blink::mojom::PresentationSessionInfo::New());
@@ -516,11 +505,11 @@ TEST_F(PresentationServiceImplTest, ListenForConnectionClose) {
     closed_info.close_reason = PRESENTATION_CONNECTION_CLOSE_REASON_WENT_AWAY;
     closed_info.message = "Foo";
 
-    EXPECT_CALL(mock_client_,
+    EXPECT_CALL(
+        mock_client_,
         OnConnectionClosed(
             Equals(presentation_connection),
-                    blink::mojom::PresentationConnectionCloseReason::WENT_AWAY,
-                    mojo::String("Foo")))
+            blink::mojom::PresentationConnectionCloseReason::WENT_AWAY, "Foo"))
         .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
     state_changed_cb.Run(closed_info);
     run_loop.Run();
@@ -580,10 +569,8 @@ TEST_F(PresentationServiceImplTest, StartSessionError) {
 
 TEST_F(PresentationServiceImplTest, JoinSessionSuccess) {
   service_ptr_->JoinSession(
-      kPresentationUrl,
-      kPresentationId,
-      base::Bind(
-          &PresentationServiceImplTest::ExpectNewSessionCallbackSuccess,
+      kPresentationUrl, base::Optional<std::string>(kPresentationId),
+      base::Bind(&PresentationServiceImplTest::ExpectNewSessionCallbackSuccess,
                  base::Unretained(this)));
   base::RunLoop run_loop;
   base::Callback<void(const PresentationSessionInfo&)> success_cb;
@@ -602,10 +589,8 @@ TEST_F(PresentationServiceImplTest, JoinSessionSuccess) {
 
 TEST_F(PresentationServiceImplTest, JoinSessionError) {
   service_ptr_->JoinSession(
-      kPresentationUrl,
-      kPresentationId,
-      base::Bind(
-          &PresentationServiceImplTest::ExpectNewSessionCallbackError,
+      kPresentationUrl, base::Optional<std::string>(kPresentationId),
+      base::Bind(&PresentationServiceImplTest::ExpectNewSessionCallbackError,
                  base::Unretained(this)));
   base::RunLoop run_loop;
   base::Callback<void(const PresentationError&)> error_cb;
@@ -719,7 +704,7 @@ TEST_F(PresentationServiceImplTest, SendArrayBuffer) {
   blink::mojom::SessionMessagePtr message_request(
       blink::mojom::SessionMessage::New());
   message_request->type = blink::mojom::PresentationMessageType::ARRAY_BUFFER;
-  message_request->data = mojo::Array<uint8_t>::From(data);
+  message_request->data = data;
   service_ptr_->SendSessionMessage(
       std::move(session), std::move(message_request),
       base::Bind(&PresentationServiceImplTest::ExpectSendSessionMessageCallback,
@@ -763,7 +748,7 @@ TEST_F(PresentationServiceImplTest, SendArrayBufferWithExceedingLimit) {
   blink::mojom::SessionMessagePtr message_request(
       blink::mojom::SessionMessage::New());
   message_request->type = blink::mojom::PresentationMessageType::ARRAY_BUFFER;
-  message_request->data = mojo::Array<uint8_t>::From(data);
+  message_request->data = data;
   service_ptr_->SendSessionMessage(
       std::move(session), std::move(message_request),
       base::Bind(&PresentationServiceImplTest::ExpectSendSessionMessageCallback,
@@ -794,7 +779,7 @@ TEST_F(PresentationServiceImplTest, SendBlobData) {
   blink::mojom::SessionMessagePtr message_request(
       blink::mojom::SessionMessage::New());
   message_request->type = blink::mojom::PresentationMessageType::BLOB;
-  message_request->data = mojo::Array<uint8_t>::From(data);
+  message_request->data = data;
   service_ptr_->SendSessionMessage(
       std::move(session), std::move(message_request),
       base::Bind(&PresentationServiceImplTest::ExpectSendSessionMessageCallback,

content/renderer/presentation/presentation_dispatcher.cc

@@ -313,10 +313,9 @@ void PresentationDispatcher::OnDestruct() {
   delete this;
 }
 
-void PresentationDispatcher::OnScreenAvailabilityUpdated(
-    const mojo::String& url, bool available) {
-  const std::string& availability_url = url.get();
-  auto status_it = availability_status_.find(availability_url);
+void PresentationDispatcher::OnScreenAvailabilityUpdated(const std::string& url,
+                                                         bool available) {
+  auto status_it = availability_status_.find(url);
   if (status_it == availability_status_.end())
     return;
   AvailabilityStatus* status = status_it->second.get();
@@ -338,9 +337,8 @@ void PresentationDispatcher::OnScreenAvailabilityUpdated(
 }
 
 void PresentationDispatcher::OnScreenAvailabilityNotSupported(
-    const mojo::String& url) {
-  const std::string& availability_url = url.get();
-  auto status_it = availability_status_.find(availability_url);
+    const std::string& url) {
+  auto status_it = availability_status_.find(url);
   if (status_it == availability_status_.end())
     return;
   AvailabilityStatus* status = status_it->second.get();
@@ -407,7 +405,7 @@ void PresentationDispatcher::OnConnectionStateChanged(
 void PresentationDispatcher::OnConnectionClosed(
     blink::mojom::PresentationSessionInfoPtr connection,
     blink::mojom::PresentationConnectionCloseReason reason,
-    const mojo::String& message) {
+    const std::string& message) {
   if (!controller_)
     return;
 
@@ -420,7 +418,7 @@ void PresentationDispatcher::OnConnectionClosed(
 
 void PresentationDispatcher::OnSessionMessagesReceived(
     blink::mojom::PresentationSessionInfoPtr session_info,
-    mojo::Array<blink::mojom::SessionMessagePtr> messages) {
+    std::vector<blink::mojom::SessionMessagePtr> messages) {
   if (!controller_)
     return;
 
@@ -431,16 +429,18 @@ void PresentationDispatcher::OnSessionMessagesReceived(
         new PresentationConnectionClient(session_info->url, session_info->id));
     switch (messages[i]->type) {
       case blink::mojom::PresentationMessageType::TEXT: {
+        // TODO(mfoltz): Do we need to DCHECK(messages[i]->message)?
         controller_->didReceiveSessionTextMessage(
             session_client.release(),
-            blink::WebString::fromUTF8(messages[i]->message));
+            blink::WebString::fromUTF8(messages[i]->message.value()));
         break;
       }
       case blink::mojom::PresentationMessageType::ARRAY_BUFFER:
       case blink::mojom::PresentationMessageType::BLOB: {
+        // TODO(mfoltz): Do we need to DCHECK(messages[i]->data)?
         controller_->didReceiveSessionBinaryMessage(
-            session_client.release(), &(messages[i]->data.front()),
-            messages[i]->data.size());
+            session_client.release(), &(messages[i]->data->front()),
+            messages[i]->data->size());
         break;
       }
       default: {
@@ -519,8 +519,7 @@ PresentationDispatcher::CreateSendBinaryMessageRequest(
   blink::mojom::SessionMessagePtr session_message =
       blink::mojom::SessionMessage::New();
   session_message->type = type;
-  std::vector<uint8_t> tmp_data_vector(data, data + length);
-  session_message->data.Swap(&tmp_data_vector);
+  session_message->data = std::vector<uint8_t>(data, data + length);
   return new SendMessageRequest(std::move(session_info),
                                 std::move(session_message));
 }

content/renderer/presentation/presentation_dispatcher.h

@@ -97,8 +97,8 @@ class CONTENT_EXPORT PresentationDispatcher
   void OnDestruct() override;
 
   // blink::mojom::PresentationServiceClient
-  void OnScreenAvailabilityNotSupported(const mojo::String& url) override;
-  void OnScreenAvailabilityUpdated(const mojo::String& url,
+  void OnScreenAvailabilityNotSupported(const std::string& url) override;
+  void OnScreenAvailabilityUpdated(const std::string& url,
                                    bool available) override;
   void OnConnectionStateChanged(
       blink::mojom::PresentationSessionInfoPtr connection,
@@ -106,10 +106,10 @@ class CONTENT_EXPORT PresentationDispatcher
   void OnConnectionClosed(
       blink::mojom::PresentationSessionInfoPtr connection,
       blink::mojom::PresentationConnectionCloseReason reason,
-      const mojo::String& message) override;
+      const std::string& message) override;
   void OnSessionMessagesReceived(
       blink::mojom::PresentationSessionInfoPtr session_info,
-      mojo::Array<blink::mojom::SessionMessagePtr> messages) override;
+      std::vector<blink::mojom::SessionMessagePtr> messages) override;
   void OnDefaultSessionStarted(
       blink::mojom::PresentationSessionInfoPtr session_info) override;
 

third_party/WebKit/public/BUILD.gn

@@ -171,13 +171,13 @@ mojom("mojo_bindings") {
     "platform/modules/offscreencanvas/offscreen_canvas_surface.mojom",
     "platform/modules/permissions/permission.mojom",
     "platform/modules/permissions/permission_status.mojom",
-    "platform/modules/presentation/presentation.mojom",
     "platform/modules/serviceworker/service_worker_event_status.mojom",
     "platform/modules/wake_lock/wake_lock_service.mojom",
     "platform/modules/webshare/webshare.mojom",
   ]
   public_deps = [
     ":android_mojo_bindings",
+    ":new_wrapper_types_mojo_bindings",
     "//cc/ipc:interfaces_surfaceid_only",
     "//device/bluetooth/public/interfaces:bluetooth_mojom_bluetooth_uuid",
     "//url/mojo:url_mojom_origin",
@@ -186,6 +186,13 @@ mojom("mojo_bindings") {
   use_new_wrapper_types = false
 }
 
+# GYP version: WebKit/public/blink.gyp:new_wrapper_types_mojo_bindings
+mojom("new_wrapper_types_mojo_bindings") {
+  sources = [
+    "platform/modules/presentation/presentation.mojom",
+  ]
+}
+
 # GYP version: WebKit/public/blink.gyp:android_mojo_bindings_java
 mojom("android_mojo_bindings") {
   sources = [

third_party/WebKit/public/blink.gyp

@@ -45,7 +45,6 @@
             'platform/modules/offscreencanvas/offscreen_canvas_surface.mojom',
             'platform/modules/permissions/permission.mojom',
             'platform/modules/permissions/permission_status.mojom',
-            'platform/modules/presentation/presentation.mojom',
             'platform/modules/serviceworker/service_worker_event_status.mojom',
             'platform/modules/wake_lock/wake_lock_service.mojom',
             'platform/modules/webshare/webshare.mojom',
@@ -54,6 +53,10 @@
         'blink_android_mojo_sources': [
             'platform/modules/payments/payment_request.mojom',
         ],
+        # Duplicated in GN: //third_party/WebKit/public:new_wrapper_types_mojo_bindings
+        'blink_new_wrapper_types_mojo_sources': [
+            'platform/modules/presentation/presentation.mojom',
+        ],
         'blink_typemap_sources': [
             '<(DEPTH)/cc/ipc/surface_id.typemap',
             '<(DEPTH)/cc/ipc/surface_sequence.typemap',
@@ -136,6 +139,29 @@
                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },
+        {
+            # GN version: //third_party/WebKit/public:new_wrapper_types_mojo_bindings_blink
+            # (generated by //third_party/WebKit/public:new_wrapper_types_mojo_bindings)
+            'target_name': 'new_wrapper_types_mojo_bindings_blink_mojom',
+            'type': 'none',
+            'variables': {
+                'mojom_files': [
+                    '<@(blink_new_wrapper_types_mojo_sources)',
+                ],
+                'mojom_typemaps': [
+                    '../Source/platform/mojo/SecurityOrigin.typemap',
+                    '<@(blink_typemap_sources)',
+                ],
+                'for_blink': 'true',
+            },
+            'dependencies' : [
+                '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces_blink',
+                '<(DEPTH)/url/url.gyp:url_mojom_for_blink',
+            ],
+            'includes': [
+                '../../../mojo/mojom_bindings_generator_explicit.gypi',
+            ],
+        },
         {
             # GN version: //third_party/WebKit/public:mojo_bindings
             'target_name': 'mojo_bindings_mojom',
@@ -160,6 +186,27 @@
                 '../../../mojo/mojom_bindings_generator_explicit.gypi',
             ],
         },
+        {
+            # GN version: //third_party/WebKit/public:new_wrapper_types_mojo_bindings
+            'target_name': 'new_wrapper_types_mojo_bindings_mojom',
+            'type': 'none',
+            'variables': {
+                'mojom_files': [
+                    '<@(blink_new_wrapper_types_mojo_sources)',
+                ],
+                'mojom_typemaps': [
+                    '<(DEPTH)/url/mojo/origin.typemap',
+                    '<@(blink_typemap_sources)',
+                ],
+            },
+            'dependencies' : [
+                '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',
+                '<(DEPTH)/url/url.gyp:url_mojom',
+            ],
+            'includes': [
+                '../../../mojo/mojom_bindings_generator_explicit.gypi',
+            ],
+        },
         {
             # GN version: //third_party/WebKit/public:mojo_bindings
             'target_name': 'mojo_bindings',
@@ -169,6 +216,8 @@
             'dependencies': [
                 'mojo_bindings_blink_mojom',
                 'mojo_bindings_mojom',
+                'new_wrapper_types_mojo_bindings_blink_mojom',
+                'new_wrapper_types_mojo_bindings_mojom',
                 '../../../mojo/mojo_public.gyp:mojo_cpp_bindings',
                 '../../../device/bluetooth/bluetooth.gyp:bluetooth_mojom',
                 '<(DEPTH)/cc/ipc/cc_ipc.gyp:interfaces',