summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_sync_channel.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-27 18:24:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-28 02:26:02 +0000
commite486004502c17ab80953ef324926a536b8030d1e (patch)
tree9f51129a18a65823dfa8242491756a0697ea274a /ipc/ipc_sync_channel.cc
parent03b487d118b5b1c0e5651a889cc56b443ba1d526 (diff)
downloadchromium_src-e486004502c17ab80953ef324926a536b8030d1e.zip
chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.gz
chromium_src-e486004502c17ab80953ef324926a536b8030d1e.tar.bz2
Global conversion of Pass()→std::move() on OS==linux
❆(੭ु ◜◡‾)੭ु⁾☃❆ BUG=557422 R=avi@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1550693002 Cr-Commit-Position: refs/heads/master@{#366956}
Diffstat (limited to 'ipc/ipc_sync_channel.cc')
-rw-r--r--ipc/ipc_sync_channel.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc
index 8e55914..d194211 100644
--- a/ipc/ipc_sync_channel.cc
+++ b/ipc/ipc_sync_channel.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
#include "base/bind.h"
#include "base/lazy_instance.h"
@@ -416,7 +417,7 @@ scoped_ptr<SyncChannel> SyncChannel::Create(
scoped_ptr<SyncChannel> channel =
Create(listener, ipc_task_runner, shutdown_event);
channel->Init(channel_handle, mode, create_pipe_now);
- return channel.Pass();
+ return channel;
}
// static
@@ -428,8 +429,8 @@ scoped_ptr<SyncChannel> SyncChannel::Create(
base::WaitableEvent* shutdown_event) {
scoped_ptr<SyncChannel> channel =
Create(listener, ipc_task_runner, shutdown_event);
- channel->Init(factory.Pass(), create_pipe_now);
- return channel.Pass();
+ channel->Init(std::move(factory), create_pipe_now);
+ return channel;
}
// static