chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc - Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

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/declarative_webrequest/webrequest_condition.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 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/extensions/api/declarative_webrequest/webrequest_action_unittest.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

index 6432eb3dc8e1ae8d6bba4c5073c3b53a9fe2b8e9..0909d165dfddfc500b23787d6db803e64f7c0bc5 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.cc

@@ -114,9 +114,9 @@ bool WebRequestCondition::IsFulfilled(

void WebRequestCondition::GetURLMatcherConditionSets(

URLMatcherConditionSet::Vector* condition_sets) const {

- if (url_matcher_conditions_)

+ if (url_matcher_conditions_.get())

condition_sets->push_back(url_matcher_conditions_);

- if (first_party_url_matcher_conditions_)

+ if (first_party_url_matcher_conditions_.get())

condition_sets->push_back(first_party_url_matcher_conditions_);

}