Chromium Code Reviews| 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..784feb4e133242fa394772eb37e335d441fc2f8e 100644 |
| --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc |
| +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc |
| @@ -330,18 +330,19 @@ 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, |
| + base::Passed(std::move(message)), callback)); |
|
dcheng
2017/03/01 00:55:49
base::Passed(&message) here and below
|
| } |
| 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); |
| @@ -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( |