components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc - Issue 1902633006: Convert //components/policy from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/policy/core/common/schema_registry_tracking_policy_provider_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

« no previous file with comments | « components/policy/core/common/schema_registry_tracking_policy_provider.cc ('k') | components/policy/core/common/schema_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc

diff --git a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc

index 4cad51709bda8447bca2a7a21c8a6e1f51d16f10..de8dcd151610389a80d1891f52cdd39b847bef45 100644

--- a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc

+++ b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc

@@ -4,10 +4,10 @@

#include "components/policy/core/common/schema_registry_tracking_policy_provider.h"

+#include <memory>

#include <string>

#include <utility>

-#include "base/memory/scoped_ptr.h"

#include "base/values.h"

#include "components/policy/core/common/mock_configuration_policy_provider.h"

#include "components/policy/core/common/policy_bundle.h"

@@ -92,7 +92,7 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, PassOnChromePolicy) {

NULL);

EXPECT_CALL(observer_, OnUpdatePolicy(&schema_registry_tracking_provider_));

- scoped_ptr<PolicyBundle> delegate_bundle(new PolicyBundle);

+ std::unique_ptr<PolicyBundle> delegate_bundle(new PolicyBundle);

delegate_bundle->CopyFrom(bundle);

delegate_bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"))

.Set("foo",

@@ -133,7 +133,7 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, SchemaReadyWithComponents) {

POLICY_SOURCE_CLOUD,

new base::StringValue("omg"),

NULL);

- scoped_ptr<PolicyBundle> bundle(new PolicyBundle);

+ std::unique_ptr<PolicyBundle> bundle(new PolicyBundle);

bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, "")).CopyFrom(policy_map);

bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"))

.CopyFrom(policy_map);

@@ -229,7 +229,7 @@ TEST_F(SchemaRegistryTrackingPolicyProviderTest, RemoveAndAddComponent) {

POLICY_SOURCE_CLOUD,

new base::StringValue("omg"),

NULL);

- scoped_ptr<PolicyBundle> copy(new PolicyBundle);

+ std::unique_ptr<PolicyBundle> copy(new PolicyBundle);

copy->CopyFrom(platform_policy);

EXPECT_CALL(observer_, OnUpdatePolicy(_));

mock_provider_.UpdatePolicy(std::move(copy));