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

Unified Diff: mojo/edk/system/raw_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/system/master_connection_manager.cc ('k') | mojo/edk/system/raw_channel_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/raw_channel.cc
diff --git a/mojo/edk/system/raw_channel.cc b/mojo/edk/system/raw_channel.cc
index f5b9bd685b9d90556747e26bbb35824526ef47bf..9c1aa247bd2573e2dbd6f1d239e140c5abe682b3 100644
--- a/mojo/edk/system/raw_channel.cc
+++ b/mojo/edk/system/raw_channel.cc
@@ -333,9 +333,8 @@ void RawChannel::OnReadCompleted(IOResult io_result, size_t bytes_read) {
&platform_handle_table);
if (num_platform_handles > 0) {
- platform_handles =
- GetReadPlatformHandles(num_platform_handles,
- platform_handle_table).Pass();
+ platform_handles = GetReadPlatformHandles(num_platform_handles,
+ platform_handle_table);
if (!platform_handles) {
LOG(ERROR) << "Invalid number of platform handles received";
CallOnError(Delegate::ERROR_READ_BAD_MESSAGE);
@@ -354,7 +353,7 @@ void RawChannel::OnReadCompleted(IOResult io_result, size_t bytes_read) {
DCHECK(!set_on_shutdown_);
set_on_shutdown_ = &shutdown_called;
DCHECK(delegate_);
- delegate_->OnReadMessage(message_view, platform_handles.Pass());
+ delegate_->OnReadMessage(message_view, std::move(platform_handles));
if (shutdown_called)
return;
set_on_shutdown_ = nullptr;
« no previous file with comments | « mojo/edk/system/master_connection_manager.cc ('k') | mojo/edk/system/raw_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698