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

Unified Diff: components/proximity_auth/cryptauth/cryptauth_client_impl_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/cryptauth/cryptauth_client_impl_unittest.cc
diff --git a/components/proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc b/components/proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc
index 21032f6d90c36c3b0e69efb3e0d81fd8ed487c4e..4fca644fc6a4b9cefab44e3f88f016d9d80f6fd1 100644
--- a/components/proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc
+++ b/components/proximity_auth/cryptauth/cryptauth_client_impl_unittest.cc
@@ -6,6 +6,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/test/null_task_runner.h"
#include "components/proximity_auth/cryptauth/cryptauth_access_token_fetcher.h"
#include "components/proximity_auth/cryptauth/cryptauth_api_call_flow.h"
@@ -111,9 +112,10 @@ class ProximityAuthCryptAuthClientTest : public testing::Test {
device_classifier.set_device_software_package(kDeviceSoftwarePackage);
device_classifier.set_device_type(kDeviceType);
- client_.reset(new CryptAuthClientImpl(
- make_scoped_ptr(api_call_flow_), make_scoped_ptr(access_token_fetcher_),
- url_request_context_, device_classifier));
+ client_.reset(
+ new CryptAuthClientImpl(base::WrapUnique(api_call_flow_),
+ base::WrapUnique(access_token_fetcher_),
+ url_request_context_, device_classifier));
}
// Sets up an expectation and captures a CryptAuth API request to
@@ -146,7 +148,7 @@ class ProximityAuthCryptAuthClientTest : public testing::Test {
StrictMock<MockCryptAuthApiCallFlow>* api_call_flow_;
scoped_refptr<net::URLRequestContextGetter> url_request_context_;
- scoped_ptr<CryptAuthClient> client_;
+ std::unique_ptr<CryptAuthClient> client_;
std::string serialized_request_;
CryptAuthApiCallFlow::ResultCallback flow_result_callback_;

Powered by Google App Engine
This is Rietveld 408576698