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

Unified Diff: components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h

Issue 1912433002: Convert //components/proximity_auth from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 8 months 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: components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h
diff --git a/components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h b/components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h
index 0b333107c5ac1728eccbed363822b9342a875660..806308b2c5c1475938b08cf724dc565084c690c3 100644
--- a/components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h
+++ b/components/proximity_auth/ble/bluetooth_low_energy_connection_finder.h
@@ -5,13 +5,13 @@
#ifndef COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CONNECTION_FINDER_H
#define COMPONENTS_PROXIMITY_AUTH_BLE_BLUETOOTH_LOW_ENERGY_CONNECTION_FINDER_H
+#include <memory>
#include <set>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "components/proximity_auth/connection.h"
#include "components/proximity_auth/connection_finder.h"
@@ -81,7 +81,7 @@ class BluetoothLowEnergyConnectionFinder
protected:
// Creates a proximity_auth::Connection with the device given by
// |device_address|. Exposed for testing.
- virtual scoped_ptr<Connection> CreateConnection(
+ virtual std::unique_ptr<Connection> CreateConnection(
const std::string& device_address);
private:
@@ -94,7 +94,7 @@ class BluetoothLowEnergyConnectionFinder
// Callback called when a new discovery session is started.
void OnDiscoverySessionStarted(
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
// Callback called when there is an error starting a new discovery session.
void OnStartDiscoverySessionError();
@@ -147,10 +147,10 @@ class BluetoothLowEnergyConnectionFinder
scoped_refptr<device::BluetoothAdapter> adapter_;
// The discovery session associated to this object.
- scoped_ptr<device::BluetoothDiscoverySession> discovery_session_;
+ std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
// The connection with |remote_device|.
- scoped_ptr<Connection> connection_;
+ std::unique_ptr<Connection> connection_;
// Callback called when the connection is established.
// device::BluetoothDevice::GattConnectionCallback connection_callback_;

Powered by Google App Engine
This is Rietveld 408576698