| Index: components/proximity_auth/unlock_manager_unittest.cc
|
| diff --git a/components/proximity_auth/unlock_manager_unittest.cc b/components/proximity_auth/unlock_manager_unittest.cc
|
| index 9f05d0c6170aae291dc7a365cb5bd2e9649c6bc0..eed56f75360e2d8c164a964ef6b0ebc102c933fe 100644
|
| --- a/components/proximity_auth/unlock_manager_unittest.cc
|
| +++ b/components/proximity_auth/unlock_manager_unittest.cc
|
| @@ -4,11 +4,11 @@
|
|
|
| #include "components/proximity_auth/unlock_manager.h"
|
|
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/test/test_simple_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "build/build_config.h"
|
| @@ -158,10 +158,10 @@ class TestUnlockManager : public UnlockManager {
|
| MockProximityMonitor* proximity_monitor() { return proximity_monitor_; }
|
|
|
| private:
|
| - scoped_ptr<ProximityMonitor> CreateProximityMonitor(
|
| + std::unique_ptr<ProximityMonitor> CreateProximityMonitor(
|
| const RemoteDevice& remote_device) override {
|
| EXPECT_EQ(kTestRemoteDevicePublicKey, remote_device.public_key);
|
| - scoped_ptr<MockProximityMonitor> proximity_monitor(
|
| + std::unique_ptr<MockProximityMonitor> proximity_monitor(
|
| new NiceMock<MockProximityMonitor>());
|
| proximity_monitor_ = proximity_monitor.get();
|
| return std::move(proximity_monitor);
|
| @@ -261,7 +261,7 @@ class ProximityAuthUnlockManagerTest : public testing::Test {
|
| NiceMock<MockProximityAuthClient> proximity_auth_client_;
|
| NiceMock<MockRemoteDeviceLifeCycle> life_cycle_;
|
| NiceMock<MockMessenger> messenger_;
|
| - scoped_ptr<TestUnlockManager> unlock_manager_;
|
| + std::unique_ptr<TestUnlockManager> unlock_manager_;
|
| FakeSecureContext secure_context_;
|
|
|
| private:
|
|
|