components/content_settings/core/browser/content_settings_origin_identifier_value_map.h - Issue 2318223002: Remove EmptyRuleIterators with nullptrs.

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/content_settings/core/browser/content_settings_origin_identifier_value_map.h

Issue 2318223002: Remove EmptyRuleIterators with nullptrs. (Closed)

Patch Set: Fix failing unit test Created 4 years, 3 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/content_settings/core/browser/content_settings_default_provider.cc ('k') | components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_origin_identifier_value_map.h

diff --git a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h

index 62c984c59de6b30ae9c71ef0f5dcd4be4ab06435..1ac2fe56bed118f216876804e563e97c8d9a14a4 100644

--- a/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h

+++ b/components/content_settings/core/browser/content_settings_origin_identifier_value_map.h

@@ -74,6 +74,7 @@ class OriginIdentifierValueMap {

// |OriginIdentifierValueMap| (also |GetRuleIterator|) before the iterator

// has been destroyed. If |lock| is non-NULL, the returned |RuleIterator|

// locks it and releases it when it is destroyed.

+ // Returns nullptr to indicate the RuleIterator is empty.

std::unique_ptr<RuleIterator> GetRuleIterator(

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,