Index: components/proximity_auth/bluetooth_connection_finder.h |
diff --git a/components/proximity_auth/bluetooth_connection_finder.h b/components/proximity_auth/bluetooth_connection_finder.h |
index ac195d8c06c5ad68f504e43b6ff109232aa0c9a1..b8b86e2d813fac0a0eedefc8edac27873918e8a9 100644 |
--- a/components/proximity_auth/bluetooth_connection_finder.h |
+++ b/components/proximity_auth/bluetooth_connection_finder.h |
@@ -5,10 +5,11 @@ |
#ifndef COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_CONNECTION_FINDER_H |
#define COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_CONNECTION_FINDER_H |
+#include <memory> |
+ |
#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 "base/time/time.h" |
#include "components/proximity_auth/bluetooth_util.h" |
@@ -38,7 +39,7 @@ class BluetoothConnectionFinder : public ConnectionFinder, |
protected: |
// Exposed for mocking out the connection in tests. |
- virtual scoped_ptr<Connection> CreateConnection(); |
+ virtual std::unique_ptr<Connection> CreateConnection(); |
// Calls bluetooth_util::SeekDeviceByAddress. Exposed for testing, as this |
// utility function is platform dependent. |
@@ -105,7 +106,7 @@ class BluetoothConnectionFinder : public ConnectionFinder, |
scoped_refptr<device::BluetoothAdapter> adapter_; |
// The Bluetooth connection that will be opened. |
- scoped_ptr<Connection> connection_; |
+ std::unique_ptr<Connection> connection_; |
// Whether there is currently a polling task scheduled. |
bool has_delayed_poll_scheduled_; |