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

Index: components/policy/core/browser/url_blacklist_policy_handler.cc

diff --git a/components/policy/core/browser/url_blacklist_policy_handler.cc b/components/policy/core/browser/url_blacklist_policy_handler.cc

index 51270ba3f634a725db83fec405e1d0ea545a33c2..80deab632dd9c706b33295faed8737f07e42357a 100644

--- a/components/policy/core/browser/url_blacklist_policy_handler.cc

+++ b/components/policy/core/browser/url_blacklist_policy_handler.cc

@@ -4,9 +4,9 @@

#include "components/policy/core/browser/url_blacklist_policy_handler.h"

+#include <memory>

#include <utility>

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

#include "base/values.h"

#include "components/policy/core/browser/policy_error_map.h"

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

@@ -55,7 +55,7 @@ void URLBlacklistPolicyHandler::ApplyPolicySettings(const PolicyMap& policies,

if (disabled_schemes_policy)

disabled_schemes_policy->GetAsList(&disabled_schemes);

- scoped_ptr<base::ListValue> merged_url_blacklist(new base::ListValue());

+ std::unique_ptr<base::ListValue> merged_url_blacklist(new base::ListValue());

// We start with the DisabledSchemes because we have size limit when

// handling URLBlacklists.