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

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

Issue 1529303004: Convert Pass()→std::move() in mojo/edk/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « mojo/edk/system/child_broker.cc ('k') | mojo/edk/system/core.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/edk/system/child_broker_host.cc
diff --git a/mojo/edk/system/child_broker_host.cc b/mojo/edk/system/child_broker_host.cc
index 95518c6e3dabef62629a84d4f33213023ca17f15..2c988737208a8bc347f21d4b9898577a05e75ff9 100644
--- a/mojo/edk/system/child_broker_host.cc
+++ b/mojo/edk/system/child_broker_host.cc
@@ -4,6 +4,8 @@
#include "mojo/edk/system/child_broker_host.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "mojo/edk/embedder/embedder_internal.h"
@@ -28,7 +30,7 @@ ChildBrokerHost::ChildBrokerHost(base::ProcessHandle child_process,
: process_id_(base::GetProcId(child_process)), child_channel_(nullptr) {
ScopedPlatformHandle parent_async_channel_handle;
#if defined(OS_POSIX)
- parent_async_channel_handle = pipe.Pass();
+ parent_async_channel_handle = std::move(pipe);
#else
DuplicateHandle(GetCurrentProcess(), child_process,
GetCurrentProcess(), &child_process,
@@ -75,14 +77,14 @@ void ChildBrokerHost::ConnectToProcess(base::ProcessId process_id,
scoped_ptr<MessageInTransit> message(new MessageInTransit(
MessageInTransit::Type::MESSAGE, sizeof(data), &data));
scoped_refptr<Dispatcher> dispatcher =
- PlatformHandleDispatcher::Create(pipe.Pass());
+ PlatformHandleDispatcher::Create(std::move(pipe));
internal::g_core->AddDispatcher(dispatcher);
scoped_ptr<DispatcherVector> dispatchers(new DispatcherVector);
dispatchers->push_back(dispatcher);
- message->SetDispatchers(dispatchers.Pass());
+ message->SetDispatchers(std::move(dispatchers));
message->SerializeAndCloseDispatchers();
message->set_route_id(kBrokerRouteId);
- child_channel_->channel()->WriteMessage(message.Pass());
+ child_channel_->channel()->WriteMessage(std::move(message));
}
void ChildBrokerHost::ConnectMessagePipe(uint64_t pipe_id,
@@ -96,7 +98,7 @@ void ChildBrokerHost::ConnectMessagePipe(uint64_t pipe_id,
scoped_ptr<MessageInTransit> message(new MessageInTransit(
MessageInTransit::Type::MESSAGE, sizeof(data), &data));
message->set_route_id(kBrokerRouteId);
- child_channel_->channel()->WriteMessage(message.Pass());
+ child_channel_->channel()->WriteMessage(std::move(message));
}
ChildBrokerHost::~ChildBrokerHost() {
@@ -109,7 +111,7 @@ ChildBrokerHost::~ChildBrokerHost() {
void ChildBrokerHost::InitOnIO(
ScopedPlatformHandle parent_async_channel_handle) {
child_channel_ = new RoutedRawChannel(
- parent_async_channel_handle.Pass(),
+ std::move(parent_async_channel_handle),
base::Bind(&ChildBrokerHost::ChannelDestructed, base::Unretained(this)));
child_channel_->AddRoute(kBrokerRouteId, this);
« no previous file with comments | « mojo/edk/system/child_broker.cc ('k') | mojo/edk/system/core.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698