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

Unified Diff: components/proximity_auth/unlock_manager_unittest.cc

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/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:
« no previous file with comments | « components/proximity_auth/unlock_manager.cc ('k') | components/proximity_auth/webui/proximity_auth_webui_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698