| Index: chrome/browser/media/android/router/media_router_android.cc
|
| diff --git a/chrome/browser/media/android/router/media_router_android.cc b/chrome/browser/media/android/router/media_router_android.cc
|
| index 91cae709091fe5e8e95c1660da7ee28fe03b6a24..c81ee84e52421d41a8a75c3094a3dff87c702820 100644
|
| --- a/chrome/browser/media/android/router/media_router_android.cc
|
| +++ b/chrome/browser/media/android/router/media_router_android.cc
|
| @@ -167,7 +167,7 @@ void MediaRouterAndroid::TerminateRoute(const MediaRoute::Id& route_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));
|
| @@ -182,15 +182,16 @@ void MediaRouterAndroid::SendRouteMessage(
|
|
|
| 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);
|
| }
|
|
|