summaryrefslogtreecommitdiffstats
path: root/device/serial/serial_connection_factory.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-12-27 14:05:10 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-27 22:06:04 +0000
commit64f325fc1d271609f83819102a8eba6d54d98d4b (patch)
treec21ad0baee4eec54413eff1df2deb4f13e0ab9a9 /device/serial/serial_connection_factory.cc
parent38b2f73d2594ec921ea1b73bebfd2da113b6799e (diff)
downloadchromium_src-64f325fc1d271609f83819102a8eba6d54d98d4b.zip
chromium_src-64f325fc1d271609f83819102a8eba6d54d98d4b.tar.gz
chromium_src-64f325fc1d271609f83819102a8eba6d54d98d4b.tar.bz2
Convert Pass()→std::move() in //device
❆(੭ु ◜◡‾)੭ु⁾☃❆ BUG=557422 R=avi@chromium.org TBR=rockot@chromium.org Review URL: https://codereview.chromium.org/1544323002 Cr-Commit-Position: refs/heads/master@{#366937}
Diffstat (limited to 'device/serial/serial_connection_factory.cc')
-rw-r--r--device/serial/serial_connection_factory.cc22
1 files changed, 12 insertions, 10 deletions
diff --git a/device/serial/serial_connection_factory.cc b/device/serial/serial_connection_factory.cc
index 49b9bc8..d167a78 100644
--- a/device/serial/serial_connection_factory.cc
+++ b/device/serial/serial_connection_factory.cc
@@ -4,6 +4,8 @@
#include "device/serial/serial_connection_factory.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/location.h"
#include "base/macros.h"
@@ -74,9 +76,9 @@ void SerialConnectionFactory::CreateConnection(
mojo::InterfaceRequest<serial::DataSink> sink,
mojo::InterfaceRequest<serial::DataSource> source,
mojo::InterfacePtr<serial::DataSourceClient> source_client) {
- scoped_refptr<ConnectTask> task(
- new ConnectTask(this, path, options.Pass(), connection_request.Pass(),
- sink.Pass(), source.Pass(), source_client.Pass()));
+ scoped_refptr<ConnectTask> task(new ConnectTask(
+ this, path, std::move(options), std::move(connection_request),
+ std::move(sink), std::move(source), std::move(source_client)));
task->Run();
}
@@ -93,10 +95,10 @@ SerialConnectionFactory::ConnectTask::ConnectTask(
mojo::InterfacePtr<serial::DataSourceClient> source_client)
: factory_(factory),
path_(path),
- options_(options.Pass()),
- connection_request_(connection_request.Pass()),
- sink_(sink.Pass()),
- source_(source.Pass()),
+ options_(std::move(options)),
+ connection_request_(std::move(connection_request)),
+ sink_(std::move(sink)),
+ source_(std::move(source)),
source_client_(source_client.PassInterface()) {
if (!options_) {
options_ = serial::ConnectionOptions::New();
@@ -126,9 +128,9 @@ void SerialConnectionFactory::ConnectTask::OnConnected(bool success) {
return;
}
- new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(),
- mojo::MakeProxy(source_client_.Pass()),
- connection_request_.Pass());
+ new SerialConnection(io_handler_, std::move(sink_), std::move(source_),
+ mojo::MakeProxy(std::move(source_client_)),
+ std::move(connection_request_));
}
} // namespace device