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

Unified Diff: device/bluetooth/bluetooth_adapter.cc

Issue 1544323002: Convert Pass()→std::move() in //device (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 | « device/battery/battery_status_service_unittest.cc ('k') | device/bluetooth/bluetooth_adapter_bluez.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter.cc
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc
index 20f73d6af945076606c4169c7e442c822ceec17a..2f90428c83bec10c7a821e17e2ff7941837cf55f 100644
--- a/device/bluetooth/bluetooth_adapter.cc
+++ b/device/bluetooth/bluetooth_adapter.cc
@@ -4,6 +4,8 @@
#include "device/bluetooth/bluetooth_adapter.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
@@ -168,9 +170,9 @@ void BluetoothAdapter::OnStartDiscoverySession(
scoped_ptr<BluetoothDiscoverySession> discovery_session(
new BluetoothDiscoverySession(scoped_refptr<BluetoothAdapter>(this),
- discovery_filter.Pass()));
+ std::move(discovery_filter)));
discovery_sessions_.insert(discovery_session.get());
- callback.Run(discovery_session.Pass());
+ callback.Run(std::move(discovery_session));
}
void BluetoothAdapter::OnStartDiscoverySessionError(
@@ -239,7 +241,7 @@ BluetoothAdapter::GetMergedDiscoveryFilterHelper(
result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter);
}
- return result.Pass();
+ return result;
}
// static
« no previous file with comments | « device/battery/battery_status_service_unittest.cc ('k') | device/bluetooth/bluetooth_adapter_bluez.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698