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

Unified Diff: third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc

Issue 1477643002: Remove the TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03 macro. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@basepass
Patch Set: type-with-move: no-media Created 5 years 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 | « third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc
diff --git a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc
index 4965b94047eb0ffa4c8e576f8e0d17ec9a0f10f9..e5e338c1ce55d29622ba3bdca45c53c5b49d57a5 100644
--- a/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc
+++ b/third_party/mojo/src/mojo/edk/test/scoped_ipc_support.cc
@@ -4,6 +4,8 @@
#include "third_party/mojo/src/mojo/edk/test/scoped_ipc_support.h"
+#include <utility>
+
#include "base/message_loop/message_loop.h"
#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
@@ -33,7 +35,7 @@ void ScopedIPCSupportHelper::Init(
io_thread_task_runner_ = io_thread_task_runner;
// Note: Run delegate methods on the I/O thread.
embedder::InitIPCSupport(process_type, process_delegate,
- io_thread_task_runner_, platform_handle.Pass());
+ io_thread_task_runner_, std::move(platform_handle));
}
void ScopedIPCSupportHelper::OnShutdownCompleteImpl() {
@@ -44,7 +46,8 @@ void ScopedIPCSupportHelper::OnShutdownCompleteImpl() {
ScopedIPCSupport::ScopedIPCSupport(
scoped_refptr<base::TaskRunner> io_thread_task_runner) {
- helper_.Init(embedder::ProcessType::NONE, this, io_thread_task_runner.Pass(),
+ helper_.Init(embedder::ProcessType::NONE, this,
+ std::move(io_thread_task_runner),
embedder::ScopedPlatformHandle());
}
@@ -58,7 +61,8 @@ void ScopedIPCSupport::OnShutdownComplete() {
ScopedMasterIPCSupport::ScopedMasterIPCSupport(
scoped_refptr<base::TaskRunner> io_thread_task_runner) {
helper_.Init(embedder::ProcessType::MASTER, this,
- io_thread_task_runner.Pass(), embedder::ScopedPlatformHandle());
+ std::move(io_thread_task_runner),
+ embedder::ScopedPlatformHandle());
}
ScopedMasterIPCSupport::ScopedMasterIPCSupport(
@@ -66,7 +70,8 @@ ScopedMasterIPCSupport::ScopedMasterIPCSupport(
base::Callback<void(embedder::SlaveInfo slave_info)> on_slave_disconnect)
: on_slave_disconnect_(on_slave_disconnect) {
helper_.Init(embedder::ProcessType::MASTER, this,
- io_thread_task_runner.Pass(), embedder::ScopedPlatformHandle());
+ std::move(io_thread_task_runner),
+ embedder::ScopedPlatformHandle());
}
ScopedMasterIPCSupport::~ScopedMasterIPCSupport() {
@@ -84,8 +89,8 @@ void ScopedMasterIPCSupport::OnSlaveDisconnect(embedder::SlaveInfo slave_info) {
ScopedSlaveIPCSupport::ScopedSlaveIPCSupport(
scoped_refptr<base::TaskRunner> io_thread_task_runner,
embedder::ScopedPlatformHandle platform_handle) {
- helper_.Init(embedder::ProcessType::SLAVE, this, io_thread_task_runner.Pass(),
- platform_handle.Pass());
+ helper_.Init(embedder::ProcessType::SLAVE, this,
+ std::move(io_thread_task_runner), std::move(platform_handle));
}
ScopedSlaveIPCSupport::ScopedSlaveIPCSupport(
@@ -93,8 +98,8 @@ ScopedSlaveIPCSupport::ScopedSlaveIPCSupport(
embedder::ScopedPlatformHandle platform_handle,
base::Closure on_master_disconnect)
: on_master_disconnect_(on_master_disconnect) {
- helper_.Init(embedder::ProcessType::SLAVE, this, io_thread_task_runner.Pass(),
- platform_handle.Pass());
+ helper_.Init(embedder::ProcessType::SLAVE, this,
+ std::move(io_thread_task_runner), std::move(platform_handle));
}
ScopedSlaveIPCSupport::~ScopedSlaveIPCSupport() {
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698