Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Unified Diff: mojo/edk/system/channel.cc

Issue 1351293002: Convert remaining scoped_ptr -> std::unique_ptr in //mojo/edk (minus js). (Closed) Base URL: https://github.com/domokit/mojo.git@edk_unique_ptr_5
Patch Set: oops, forgot to fix android Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/edk/embedder/test_embedder.cc ('k') | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/channel.cc
diff --git a/mojo/edk/system/channel.cc b/mojo/edk/system/channel.cc
index e70ca216753608ae8f7486a1e0e881cc1bf5279f..7cd6f2f96e872f7a409291c9430f3bcc8943462a 100644
--- a/mojo/edk/system/channel.cc
+++ b/mojo/edk/system/channel.cc
@@ -297,10 +297,10 @@ void Channel::OnReadMessage(
switch (message_view.type()) {
case MessageInTransit::Type::ENDPOINT_CLIENT:
case MessageInTransit::Type::ENDPOINT:
- OnReadMessageForEndpoint(message_view, platform_handles.Pass());
+ OnReadMessageForEndpoint(message_view, std::move(platform_handles));
break;
case MessageInTransit::Type::CHANNEL:
- OnReadMessageForChannel(message_view, platform_handles.Pass());
+ OnReadMessageForChannel(message_view, std::move(platform_handles));
break;
default:
HandleRemoteError(
@@ -396,7 +396,7 @@ void Channel::OnReadMessageForEndpoint(
DCHECK(message_view.transport_data_buffer());
message->SetDispatchers(TransportData::DeserializeDispatchers(
message_view.transport_data_buffer(),
- message_view.transport_data_buffer_size(), platform_handles.Pass(),
+ message_view.transport_data_buffer_size(), std::move(platform_handles),
this));
}
« no previous file with comments | « mojo/edk/embedder/test_embedder.cc ('k') | mojo/edk/system/master_connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698