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

Unified Diff: components/proximity_auth/remote_device_loader_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
« no previous file with comments | « components/proximity_auth/remote_device_loader.cc ('k') | components/proximity_auth/remote_status_update.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/proximity_auth/remote_device_loader_unittest.cc
diff --git a/components/proximity_auth/remote_device_loader_unittest.cc b/components/proximity_auth/remote_device_loader_unittest.cc
index d1bf80296a886bbfba1ab8043d392a056da9c94b..8709e8de954bf4e49bcc25420c5e7d5a8bc9a1ad 100644
--- a/components/proximity_auth/remote_device_loader_unittest.cc
+++ b/components/proximity_auth/remote_device_loader_unittest.cc
@@ -5,11 +5,12 @@
#include "components/proximity_auth/remote_device_loader.h"
#include <stddef.h>
+
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/proximity_auth/cryptauth/fake_secure_message_delegate.h"
#include "components/proximity_auth/proximity_auth_pref_manager.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -70,7 +71,7 @@ class ProximityAuthRemoteDeviceLoaderTest : public testing::Test {
protected:
// Handles deriving the PSK. Ownership will be passed to the
// RemoteDeviceLoader under test.
- scoped_ptr<FakeSecureMessageDelegate> secure_message_delegate_;
+ std::unique_ptr<FakeSecureMessageDelegate> secure_message_delegate_;
// The private key of the user local device.
std::string user_private_key_;
@@ -79,7 +80,7 @@ class ProximityAuthRemoteDeviceLoaderTest : public testing::Test {
std::vector<RemoteDevice> remote_devices_;
// Stores the bluetooth address for BLE devices.
- scoped_ptr<MockProximityAuthPrefManager> pref_manager_;
+ std::unique_ptr<MockProximityAuthPrefManager> pref_manager_;
DISALLOW_COPY_AND_ASSIGN(ProximityAuthRemoteDeviceLoaderTest);
};
« no previous file with comments | « components/proximity_auth/remote_device_loader.cc ('k') | components/proximity_auth/remote_status_update.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698