chrome/browser/content_settings/content_settings_policy_provider.cc - Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

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: chrome/browser/content_settings/content_settings_policy_provider.cc

Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 7 years, 4 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 | « chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_policy_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_policy_provider.cc b/chrome/browser/content_settings/content_settings_policy_provider.cc

index cc13f6735c303f6fe248d7f4d1546fe6495e9933..8e32289fcae94d905ebabc7dd2bf87148502e1f2 100644

--- a/chrome/browser/content_settings/content_settings_policy_provider.cc

+++ b/chrome/browser/content_settings/content_settings_policy_provider.cc

@@ -349,9 +349,8 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences(

static_cast<base::DictionaryValue*>(value.release()));

std::string pattern_str;

bool pattern_read = pattern_filter_pair->GetString("pattern", &pattern_str);

- base::Value* cert_filter_ptr = NULL;

- bool filter_read = pattern_filter_pair->Remove("filter", &cert_filter_ptr);

- scoped_ptr<base::Value> cert_filter(cert_filter_ptr);

+ scoped_ptr<base::Value> cert_filter;

+ bool filter_read = pattern_filter_pair->Remove("filter", &cert_filter);

if (!pattern_read || !filter_read ||

!cert_filter->IsType(base::Value::TYPE_DICTIONARY)) {

VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"