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

Unified Diff: components/policy/core/common/cloud/cloud_policy_validator_unittest.cc

Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use namespace alias 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/policy/core/common/cloud/cloud_policy_validator_unittest.cc
diff --git a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
index 3b947c5bcbb6cd75aaa79ede278f45f400908dd1..098ce2f16001c39fc1a4df79c1fd7c2131b33ca4 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
@@ -5,12 +5,14 @@
#include "components/policy/core/common/cloud/cloud_policy_validator.h"
#include <stdint.h>
+
+#include <memory>
#include <utility>
#include <vector>
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_util.h"
@@ -59,9 +61,9 @@ class CloudPolicyValidatorTest : public testing::Test {
void ValidatePolicy(
testing::Action<void(UserCloudPolicyValidator*)> check_action,
- scoped_ptr<enterprise_management::PolicyFetchResponse> policy_response) {
+ std::unique_ptr<em::PolicyFetchResponse> policy_response) {
// Create a validator.
- scoped_ptr<UserCloudPolicyValidator> validator =
+ std::unique_ptr<UserCloudPolicyValidator> validator =
CreateValidator(std::move(policy_response));
// Run validation and check the result.
@@ -74,8 +76,8 @@ class CloudPolicyValidatorTest : public testing::Test {
Mock::VerifyAndClearExpectations(this);
}
- scoped_ptr<UserCloudPolicyValidator> CreateValidator(
- scoped_ptr<enterprise_management::PolicyFetchResponse> policy_response) {
+ std::unique_ptr<UserCloudPolicyValidator> CreateValidator(
+ std::unique_ptr<em::PolicyFetchResponse> policy_response) {
std::vector<uint8_t> public_key_bytes;
EXPECT_TRUE(
PolicyBuilder::CreateTestSigningKey()->ExportPublicKey(
@@ -107,7 +109,7 @@ class CloudPolicyValidatorTest : public testing::Test {
allow_key_rotation_);
if (allow_key_rotation_)
validator->ValidateInitialKey(GetPolicyVerificationKey(), owning_domain_);
- return make_scoped_ptr(validator);
+ return base::WrapUnique(validator);
}
@@ -145,8 +147,8 @@ TEST_F(CloudPolicyValidatorTest, SuccessfulValidation) {
TEST_F(CloudPolicyValidatorTest, SuccessfulRunValidation) {
policy_.Build();
- scoped_ptr<UserCloudPolicyValidator> validator = CreateValidator(
- policy_.GetCopy());
+ std::unique_ptr<UserCloudPolicyValidator> validator =
+ CreateValidator(policy_.GetCopy());
// Run validation immediately (no background tasks).
validator->RunValidation();
CheckSuccessfulValidation(validator.get());

Powered by Google App Engine
This is Rietveld 408576698