[Presentation API] Mojo typemap for content::PresentationConnectionMessage

chrome/browser/media/android/router/media_router_android.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 "chrome/browser/media/android/router/media_router_android.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 149 matching lines @@
 
 void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
   Java_ChromeMediaRouter_closeRoute(env, java_media_router_, jroute_id);
 }
 
 void MediaRouterAndroid::SendRouteMessage(
     const MediaRoute::Id& route_id,
-    const std::string& message,
+    std::string message,
     const SendRouteMessageCallback& callback) {
   int callback_id = message_callbacks_.Add(
       base::MakeUnique<SendRouteMessageCallback>(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
           base::android::ConvertUTF8ToJavaString(env, route_id);
   ScopedJavaLocalRef<jstring> jmessage =
           base::android::ConvertUTF8ToJavaString(env, message);

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

There's probably not a lot of gain to using move semantics here: we can't use
move semantics to move ownership of the data into Java. In addition, every layer
that passes by value has an additional bit of code to run the destructor, which
makes the binary a bit bigger.

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

Acknowledged.

   Java_ChromeMediaRouter_sendStringMessage(env, java_media_router_, jroute_id,
                                            jmessage, callback_id);
 }
 
 void MediaRouterAndroid::SendRouteBinaryMessage(
     const MediaRoute::Id& route_id,
-    std::unique_ptr<std::vector<uint8_t>> data,
+    std::vector<uint8_t> data,
     const SendRouteMessageCallback& callback) {
+  // TODO(crbug.com/524128): Remove support for binary messaging.
   int callback_id = message_callbacks_.Add(
       base::MakeUnique<SendRouteMessageCallback>(callback));
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jroute_id =
       base::android::ConvertUTF8ToJavaString(env, route_id);
   ScopedJavaLocalRef<jbyteArray> jbyte_array =
-      base::android::ToJavaByteArray(env, &((*data)[0]), data->size());
+      base::android::ToJavaByteArray(env, &(data[0]), data.size());
   Java_ChromeMediaRouter_sendBinaryMessage(env, java_media_router_, jroute_id,
                                            jbyte_array, callback_id);
 }
 
 void MediaRouterAndroid::AddIssue(const IssueInfo& issue_info) {
   NOTIMPLEMENTED();
 }
 
 void MediaRouterAndroid::ClearIssue(const Issue::Id& issue_id) {
   NOTIMPLEMENTED();
@@ skipping 234 matching lines @@
     return;
 
   std::vector<RouteMessage> messages(1);
   messages.front().type = RouteMessage::TEXT;
   messages.front().text = ConvertJavaStringToUTF8(env, jmessage);
   for (auto& observer : *it->second.get())
     observer.OnMessagesReceived(messages);
 }
 
 }  // namespace media_router