[Presentation API] Mojo typemap for content::PresentationConnectionMessage

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

Index: chrome/browser/media/router/mojo/media_router_mojo_impl.cc
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
index 82bf5d61afcd190d2b1eff7d8f50206112bf1dd8..ff64f46b36ceaa0f2c5c557e45acad4cee7511be 100644
--- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
+++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -330,25 +330,26 @@ void MediaRouterMojoImpl::DetachRoute(const MediaRoute::Id& route_id) {
 
 void MediaRouterMojoImpl::SendRouteMessage(
     const MediaRoute::Id& route_id,
-    const std::string& message,
+    std::string message,
     const SendRouteMessageCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_MESSAGE);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionMessage,
-                        base::Unretained(this), route_id, message, callback));
+                        base::Unretained(this), route_id, std::move(message),

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

Ah... I guess this is where move semantics might be useful. However, this should
be using base::Passed(). std::move() transfers ownership into the callback, but
the callback won't transfer callback to the invoked function, so it ends up
copying there.

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

Done.

+                        callback));
 }
 
 void MediaRouterMojoImpl::SendRouteBinaryMessage(
     const MediaRoute::Id& route_id,
-    std::unique_ptr<std::vector<uint8_t>> data,
+    std::vector<uint8_t> data,
     const SendRouteMessageCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   SetWakeReason(MediaRouteProviderWakeReason::SEND_SESSION_BINARY_MESSAGE);
   RunOrDefer(base::Bind(&MediaRouterMojoImpl::DoSendSessionBinaryMessage,
-                        base::Unretained(this), route_id,
-                        base::Passed(std::move(data)), callback));
+                        base::Unretained(this), route_id, std::move(data),
+                        callback));
 }
 
 void MediaRouterMojoImpl::AddIssue(const IssueInfo& issue_info) {
@@ -617,18 +618,20 @@ void MediaRouterMojoImpl::DoDetachRoute(const MediaRoute::Id& route_id) {
 
 void MediaRouterMojoImpl::DoSendSessionMessage(
     const MediaRoute::Id& route_id,
-    const std::string& message,
+    std::string message,
     const SendRouteMessageCallback& callback) {
   DVLOG_WITH_INSTANCE(1) << "SendRouteMessage " << route_id;
-  media_route_provider_->SendRouteMessage(route_id, message, callback);
+  media_route_provider_->SendRouteMessage(route_id, std::move(message),
+                                          callback);
 }
 
 void MediaRouterMojoImpl::DoSendSessionBinaryMessage(
     const MediaRoute::Id& route_id,
-    std::unique_ptr<std::vector<uint8_t>> data,
+    std::vector<uint8_t> data,
     const SendRouteMessageCallback& callback) {
   DVLOG_WITH_INSTANCE(1) << "SendRouteBinaryMessage " << route_id;
-  media_route_provider_->SendRouteBinaryMessage(route_id, *data, callback);
+  media_route_provider_->SendRouteBinaryMessage(route_id, std::move(data),
+                                                callback);
 }
 
 void MediaRouterMojoImpl::DoStartListeningForRouteMessages(