| Index: components/proximity_auth/bluetooth_throttler_impl.h
|
| diff --git a/components/proximity_auth/bluetooth_throttler_impl.h b/components/proximity_auth/bluetooth_throttler_impl.h
|
| index 3ba71541def03e9476a9829e06c97daec13c110d..07b0a00acb90a82dc21c4f1ebaf5c1f982455378 100644
|
| --- a/components/proximity_auth/bluetooth_throttler_impl.h
|
| +++ b/components/proximity_auth/bluetooth_throttler_impl.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_THROTTLER_IMPL_H
|
| #define COMPONENTS_PROXIMITY_AUTH_BLUETOOTH_THROTTLER_IMPL_H
|
|
|
| +#include <memory>
|
| #include <set>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "components/proximity_auth/bluetooth_throttler.h"
|
| #include "components/proximity_auth/connection_observer.h"
|
| @@ -30,7 +30,7 @@ class BluetoothThrottlerImpl : public BluetoothThrottler,
|
| public:
|
| // Creates a throttler for connections to a remote device, using the |clock|
|
| // as a time source.
|
| - explicit BluetoothThrottlerImpl(scoped_ptr<base::TickClock> clock);
|
| + explicit BluetoothThrottlerImpl(std::unique_ptr<base::TickClock> clock);
|
| ~BluetoothThrottlerImpl() override;
|
|
|
| // BluetoothThrottler:
|
| @@ -52,7 +52,7 @@ class BluetoothThrottlerImpl : public BluetoothThrottler,
|
| base::TimeTicks last_disconnect_time_;
|
|
|
| // The time source.
|
| - scoped_ptr<base::TickClock> clock_;
|
| + std::unique_ptr<base::TickClock> clock_;
|
|
|
| // The currently connected connections.
|
| // Each connection is stored as a weak reference, which is safe because |this|
|
|
|