components/search_engines/util.cc - Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr

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/search_engines/util.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scopedptrequals: followupfix-after-rebase Created 5 years, 1 month 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/invalidation/impl/ticl_invalidation_service.cc ('k') | components/sync_driver/profile_sync_auth_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/search_engines/util.cc

diff --git a/components/search_engines/util.cc b/components/search_engines/util.cc

index 2e16a9c65f8783a261bf04d37bc7ba4aea2fd7aa..01c95974ec6cef196b8bf4ffc54dabfdf43564bc 100644

--- a/components/search_engines/util.cc

+++ b/components/search_engines/util.cc

@@ -202,8 +202,8 @@ void MergeEnginesFromPrepopulateData(

for (std::vector<TemplateURL*>::iterator i = actions.removed_engines.begin();

i < actions.removed_engines.end(); ++i) {

scoped_ptr<TemplateURL> template_url(*i);

- TemplateURLService::TemplateURLVector::iterator j =

- std::find(template_urls->begin(), template_urls->end(), template_url);

+ TemplateURLService::TemplateURLVector::iterator j = std::find(

+ template_urls->begin(), template_urls->end(), template_url.get());

DCHECK(j != template_urls->end());

DCHECK(!default_search_provider ||

(*j)->prepopulate_id() != default_search_provider->prepopulate_id());

« no previous file with comments | « components/invalidation/impl/ticl_invalidation_service.cc ('k') | components/sync_driver/profile_sync_auth_provider.cc » ('j') | no next file with comments »