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 |