chrome/browser/extensions/api/declarative/deduping_factory.h - 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/deduping_factory.h

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/declarative_rule_unittest.cc ('k') | chrome/browser/extensions/api/declarative/deduping_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative/deduping_factory.h

diff --git a/chrome/browser/extensions/api/declarative/deduping_factory.h b/chrome/browser/extensions/api/declarative/deduping_factory.h

index 462753393760dc4bf00449b5a29a0f115160b943..b34d9a0c4e9738fffc4067a065e95e56a13141d4 100644

--- a/chrome/browser/extensions/api/declarative/deduping_factory.h

+++ b/chrome/browser/extensions/api/declarative/deduping_factory.h

@@ -134,7 +134,7 @@ scoped_refptr<const BaseClassT> DedupingFactory<BaseClassT>::Instantiate(

if (prototypes.empty()) {

scoped_refptr<const BaseClassT> new_object =

(*factory_method)(instance_type, value, error, bad_message);

- if (!new_object || !error->empty() || *bad_message)

+ if (!new_object.get() || !error->empty() || *bad_message)

return scoped_refptr<const BaseClassT>();

prototypes.push_back(new_object);

}

@@ -144,7 +144,7 @@ scoped_refptr<const BaseClassT> DedupingFactory<BaseClassT>::Instantiate(

// Handle parameterized objects.

scoped_refptr<const BaseClassT> new_object =

(*factory_method)(instance_type, value, error, bad_message);

- if (!new_object || !error->empty() || *bad_message)

+ if (!new_object.get() || !error->empty() || *bad_message)

return scoped_refptr<const BaseClassT>();

size_t length = 0;