components/policy/core/common/cloud/policy_header_service.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/cloud/policy_header_service.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/cloud/policy_header_service.h ('k') | components/policy/core/common/cloud/policy_header_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/policy/core/common/cloud/policy_header_service.cc

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

index 607843dbb6ff7cd8d3cb29c7b98a1c61b73f003f..f5e6ecb87909d0d3ecb2103012fbaca9139acdf5 100644

--- a/components/policy/core/common/cloud/policy_header_service.cc

+++ b/components/policy/core/common/cloud/policy_header_service.cc

@@ -6,6 +6,7 @@

#include "base/base64.h"

#include "base/json/json_writer.h"

+#include "base/memory/ptr_util.h"

#include "base/values.h"

#include "components/policy/core/common/cloud/cloud_policy_store.h"

#include "components/policy/core/common/cloud/policy_header_io_helper.h"

@@ -38,11 +39,11 @@ PolicyHeaderService::~PolicyHeaderService() {

device_policy_store_->RemoveObserver(this);

}

-scoped_ptr<PolicyHeaderIOHelper>

+std::unique_ptr<PolicyHeaderIOHelper>

PolicyHeaderService::CreatePolicyHeaderIOHelper(

scoped_refptr<base::SequencedTaskRunner> task_runner) {

std::string initial_header_value = CreateHeaderValue();

- scoped_ptr<PolicyHeaderIOHelper> helper = make_scoped_ptr(

+ std::unique_ptr<PolicyHeaderIOHelper> helper = base::WrapUnique(

new PolicyHeaderIOHelper(server_url_, initial_header_value, task_runner));

helpers_.push_back(helper.get());

return helper;