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

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

Issue 1350503004: Some easy conversions of scoped_ptr -> std::unique_ptr in the EDK. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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/raw_channel.h ('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 20f74d28de86d1a2c320663ed2c2f1cbea1afd48..0f89bc3e054067e1d84a427ff361b66fd1bfe420 100644
--- a/mojo/edk/system/raw_channel.cc
+++ b/mojo/edk/system/raw_channel.cc
@@ -7,6 +7,7 @@
#include <string.h>
#include <algorithm>
+#include <utility>
#include "base/bind.h"
#include "base/location.h"
@@ -217,7 +218,7 @@ void RawChannel::Shutdown() {
write_stopped_ = true;
weak_ptr_factory_.InvalidateWeakPtrs();
- OnShutdownNoLock(read_buffer_.Pass(), write_buffer_.Pass());
+ OnShutdownNoLock(std::move(read_buffer_), std::move(write_buffer_));
}
// Reminder: This must be thread-safe.
« no previous file with comments | « mojo/edk/system/raw_channel.h ('k') | mojo/edk/system/raw_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698