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

Unified Diff: content/browser/bluetooth/bluetooth_dispatcher_host.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (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
Index: content/browser/bluetooth/bluetooth_dispatcher_host.cc
diff --git a/content/browser/bluetooth/bluetooth_dispatcher_host.cc b/content/browser/bluetooth/bluetooth_dispatcher_host.cc
index 3f93b2b2e7e9c5e15d0bf50431a316ba00ab4553..56a1d4f3f1cf73eb7c6213a0a3419eeee76e3ca5 100644
--- a/content/browser/bluetooth/bluetooth_dispatcher_host.cc
+++ b/content/browser/bluetooth/bluetooth_dispatcher_host.cc
@@ -340,7 +340,7 @@ struct BluetoothDispatcherHost::RequestDeviceSession {
for (const BluetoothUUID& service : services) {
discovery_filter->AddUUID(service);
}
- return discovery_filter.Pass();
+ return discovery_filter;
}
const int thread_id;
@@ -442,7 +442,7 @@ void BluetoothDispatcherHost::StopDeviceDiscovery() {
!iter.IsAtEnd(); iter.Advance()) {
RequestDeviceSession* session = iter.GetCurrentValue();
if (session->discovery_session) {
- StopDiscoverySession(session->discovery_session.Pass());
+ StopDiscoverySession(std::move(session->discovery_session));
}
if (session->chooser) {
session->chooser->ShowDiscoveryState(
@@ -991,14 +991,14 @@ void BluetoothDispatcherHost::OnDiscoverySessionStarted(
VLOG(1) << "Started discovery session for " << chooser_id;
if (RequestDeviceSession* session =
request_device_sessions_.Lookup(chooser_id)) {
- session->discovery_session = discovery_session.Pass();
+ session->discovery_session = std::move(discovery_session);
// Arrange to stop discovery later.
discovery_session_timer_.Reset();
} else {
VLOG(1) << "Chooser " << chooser_id
<< " was closed before the session finished starting. Stopping.";
- StopDiscoverySession(discovery_session.Pass());
+ StopDiscoverySession(std::move(discovery_session));
}
}
@@ -1139,7 +1139,7 @@ void BluetoothDispatcherHost::OnGATTConnectionCreated(
base::TimeTicks start_time,
scoped_ptr<device::BluetoothGattConnection> connection) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- connections_.push_back(connection.Pass());
+ connections_.push_back(std::move(connection));
RecordConnectGATTTimeSuccess(base::TimeTicks::Now() - start_time);
RecordConnectGATTOutcome(UMAConnectGATTOutcome::SUCCESS);
Send(new BluetoothMsg_ConnectGATTSuccess(thread_id, request_id, device_id));
@@ -1229,7 +1229,7 @@ void BluetoothDispatcherHost::OnStartNotifySessionSuccess(
const std::string characteristic_instance_id =
notify_session->GetCharacteristicIdentifier();
characteristic_id_to_notify_session_.insert(
- std::make_pair(characteristic_instance_id, notify_session.Pass()));
+ std::make_pair(characteristic_instance_id, std::move(notify_session)));
Send(new BluetoothMsg_StartNotificationsSuccess(thread_id, request_id));
}
« no previous file with comments | « content/browser/battery_status/battery_monitor_integration_browsertest.cc ('k') | content/browser/browser_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698