chrome/browser/extensions/api/content_settings/content_settings_store.cc - Issue 2000803003: Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

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/extensions/api/content_settings/content_settings_store.cc

Issue 2000803003: Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More fixes Created 4 years, 7 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/devtools/devtools_embedder_message_dispatcher.cc ('k') | chrome/browser/extensions/api/gcd_private/gcd_private_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc

diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

index 765636dbf9ec3793ae39732d508de8bc37c38e5a..8f9b1c6c00cc6a87eddc4e3da5417044a7a9efc5 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

@@ -288,13 +288,12 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(

const std::string& extension_id,

const base::ListValue* list,

ExtensionPrefsScope scope) {

- for (base::ListValue::const_iterator it = list->begin();

- it != list->end(); ++it) {

- if ((*it)->GetType() != base::Value::TYPE_DICTIONARY) {

+ for (const auto& value : *list) {

+ base::DictionaryValue* dict;

+ if (!value->GetAsDictionary(&dict)) {

NOTREACHED();

continue;

}

- base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(*it);

std::string primary_pattern_str;

dict->GetString(keys::kPrimaryPatternKey, &primary_pattern_str);

ContentSettingsPattern primary_pattern =