chrome/renderer/safe_browsing/phishing_classifier_delegate.cc - Issue 7408001: If we show a SafeBrowsing warning we always send the client-side detection

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/renderer/safe_browsing/phishing_classifier_delegate.cc

Issue 7408001: If we show a SafeBrowsing warning we always send the client-side detection (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Created 9 years, 5 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

« chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc ('K') | « chrome/common/safe_browsing/safebrowsing_messages.h ('k') | chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

index a276d5adf7062b1a26369ec447ae613f859aa56b..5b273a476f2ca75d279b3ce3d060ca2f51757ec1 100644

--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

@@ -199,12 +199,11 @@ void PhishingClassifierDelegate::ClassificationDone(

classifier_page_text_.clear();

VLOG(2) << "Phishy verdict = " << verdict.is_phishing()

<< " score = " << verdict.client_score();

- if (!verdict.is_phishing()) {

- return;

+ if (verdict.client_score() != PhishingClassifier::kInvalidScore) {

+ DCHECK(last_url_sent_to_classifier_.spec() == verdict.url());

Brian Ryner 2011/07/19 21:27:10 Maybe switch this to DCHECK_EQ while you're here?

noelutz 2011/07/19 22:28:08 Done.

+ Send(new SafeBrowsingHostMsg_PhishingDetectionDone(

+ routing_id(), verdict.SerializeAsString()));

}

- DCHECK(last_url_sent_to_classifier_.spec() == verdict.url());

- Send(new SafeBrowsingHostMsg_DetectedPhishingSite(

- routing_id(), verdict.SerializeAsString()));

}

GURL PhishingClassifierDelegate::GetToplevelUrl() {