components/policy/core/common/cloud/cloud_policy_manager.h - 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/cloud_policy_manager.h

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

Index: components/policy/core/common/cloud/cloud_policy_manager.h

diff --git a/components/policy/core/common/cloud/cloud_policy_manager.h b/components/policy/core/common/cloud/cloud_policy_manager.h

index 04d3076fe9b61eb6fd83a974b50dc9ff070bfe44..a8b8e0df3ad42958c27f1bb6ae4230ea793e9258 100644

--- a/components/policy/core/common/cloud/cloud_policy_manager.h

+++ b/components/policy/core/common/cloud/cloud_policy_manager.h

@@ -5,12 +5,12 @@

#ifndef COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_MANAGER_H_

#define COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_MANAGER_H_

+#include <memory>

#include <string>

#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

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

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

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

@@ -105,7 +105,7 @@ class POLICY_EXPORT CloudPolicyManager

void OnRefreshComplete(bool success);

CloudPolicyCore core_;

- scoped_ptr<ComponentCloudPolicyService> component_policy_service_;

+ std::unique_ptr<ComponentCloudPolicyService> component_policy_service_;

// Whether there's a policy refresh operation pending, in which case all

// policy update notifications are deferred until after it completes.