[Presentation API] Mojo typemap for content::PresentationConnectionMessage

chrome/browser/media/router/browser_presentation_connection_proxy.cc

Index: chrome/browser/media/router/browser_presentation_connection_proxy.cc
diff --git a/chrome/browser/media/router/browser_presentation_connection_proxy.cc b/chrome/browser/media/router/browser_presentation_connection_proxy.cc
index 3dead0d453d3692436d4d4c1aeb4fa125efff125..283ac7d6078031d9283fddffab6b344ff617d581 100644
--- a/chrome/browser/media/router/browser_presentation_connection_proxy.cc
+++ b/chrome/browser/media/router/browser_presentation_connection_proxy.cc
@@ -5,53 +5,6 @@
 #include "chrome/browser/media/router/browser_presentation_connection_proxy.h"
 
 #include "chrome/browser/media/router/media_router.h"
-#include "content/public/common/presentation_constants.h"
-
-namespace {
-
-// TODO(crbug.com/632623): remove this function when we finish typemaps for
-// presentation.mojom.
-std::unique_ptr<content::PresentationConnectionMessage>
-PresentationConnectionMessageFromMojo(
-    blink::mojom::ConnectionMessagePtr input) {
-  std::unique_ptr<content::PresentationConnectionMessage> output;
-  if (input.is_null())
-    return output;
-
-  switch (input->type) {
-    case blink::mojom::PresentationMessageType::TEXT: {
-      // Return nullptr content::PresentationSessionMessage if invalid (unset
-      // |message|, set |data|, or size too large).
-      if (input->data || !input->message ||
-          input->message->size() >
-              content::kMaxPresentationConnectionMessageSize)
-        return output;
-
-      output.reset(new content::PresentationConnectionMessage(
-          content::PresentationMessageType::TEXT));
-      output->message = std::move(input->message.value());
-      return output;
-    }
-    case blink::mojom::PresentationMessageType::BINARY: {
-      // Return nullptr content::PresentationSessionMessage if invalid (unset
-      // |data|, set |message|, or size too large).
-      if (!input->data || input->message ||
-          input->data->size() > content::kMaxPresentationConnectionMessageSize)
-        return output;
-
-      output.reset(new content::PresentationConnectionMessage(
-          content::PresentationMessageType::BINARY));
-      output->data.reset(
-          new std::vector<uint8_t>(std::move(input->data.value())));
-      return output;
-    }
-  }
-
-  NOTREACHED() << "Invalid presentation message type " << input->type;
-  return output;
-}
-
-}  // namespace
 
 namespace media_router {
 
@@ -75,19 +28,15 @@ BrowserPresentationConnectionProxy::BrowserPresentationConnectionProxy(
 BrowserPresentationConnectionProxy::~BrowserPresentationConnectionProxy() {}
 
 void BrowserPresentationConnectionProxy::OnMessage(
-    blink::mojom::ConnectionMessagePtr connection_message,
+    const content::PresentationConnectionMessage& message,
     const OnMessageCallback& on_message_callback) {
   DVLOG(2) << "BrowserPresentationConnectionProxy::OnMessage";
-  DCHECK(!connection_message.is_null());
-
-  auto message =
-      PresentationConnectionMessageFromMojo(std::move(connection_message));
-
-  if (message->is_binary()) {
-    router_->SendRouteBinaryMessage(route_id_, std::move(message->data),
+  if (message.is_binary()) {
+    router_->SendRouteBinaryMessage(route_id_, message.data.value(),

[dcheng, 2017/02/28 06:45:26]

This has to copy anyway, since |message| is const. So const ref is better here.

[mark a. foltz, 2017/02/28 18:35:20]

Now use std::move() since message is now non-const.

                                     on_message_callback);
   } else {
-    router_->SendRouteMessage(route_id_, message->message, on_message_callback);
+    router_->SendRouteMessage(route_id_, message.message.value(),
+                              on_message_callback);
   }
 }