summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/safe_browsing
diff options
context:
space:
mode:
authorbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 22:12:11 +0000
committerbryner@chromium.org <bryner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 22:12:11 +0000
commit1fc104d078b910dba6fb1eff1ed6572dac1f5642 (patch)
treeb7b1e96e99f33df89dfa02cedbc2fe5ab5f668d8 /chrome/renderer/safe_browsing
parentf8bcbe34b0562c014aaa202163b9baaf638a6b77 (diff)
downloadchromium_src-1fc104d078b910dba6fb1eff1ed6572dac1f5642.zip
chromium_src-1fc104d078b910dba6fb1eff1ed6572dac1f5642.tar.gz
chromium_src-1fc104d078b910dba6fb1eff1ed6572dac1f5642.tar.bz2
PhishingClassifierDelegate test cleanup, and fix a bug with session history navigation.
As of r74028, the RenderView will send notifications directly to the PhishingClassifierDelegate that we are using in the test. As a result, we don't need to explicitly send DidCommitProvisionalLoad notifications to the delegate; the RenderView is doing that for us. As a side-effect of replacing these one-off notifications with real navigations, I also noticed a problem where pending classifications are not cancelled on back/forward/reload because these are not new navigations. This CL fixes that as well. BUG=none TEST=PhishingClassifierDelegateTest Review URL: http://codereview.chromium.org/6425003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/safe_browsing')
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_delegate.cc3
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc31
2 files changed, 9 insertions, 25 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index d99d3aa..7fd0595 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -117,9 +117,6 @@ void PhishingClassifierDelegate::SetPhishingScorer(
void PhishingClassifierDelegate::DidCommitProvisionalLoad(
WebKit::WebFrame* frame, bool is_new_navigation) {
- if (!is_new_navigation)
- return;
-
// A new page is starting to load. Unless the load is a navigation within
// the same page, we need to cancel classification since the content will
// now be inconsistent with the phishing model.
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
index 0863aaf..76a706e 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc
@@ -104,16 +104,12 @@ TEST_F(PhishingClassifierDelegateTest, Navigation) {
ASSERT_TRUE(classifier->is_ready());
// Test an initial load. We expect classification to happen normally.
- EXPECT_CALL(*classifier, CancelPendingClassification());
+ EXPECT_CALL(*classifier, CancelPendingClassification()).Times(2);
responses_["http://host.com/"] =
"<html><body><iframe src=\"http://sub1.com/\"></iframe></body></html>";
LoadURL("http://host.com/");
- WebKit::WebFrame* child_frame = GetMainFrame()->firstChild();
- string16 page_text = ASCIIToUTF16("dummy");
- EXPECT_CALL(*classifier, CancelPendingClassification()).Times(2);
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
- delegate->DidCommitProvisionalLoad(child_frame, true);
Mock::VerifyAndClearExpectations(classifier);
+ string16 page_text = ASCIIToUTF16("dummy");
EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _)).
WillOnce(DeleteArg<1>());
delegate->PageCaptured(page_text);
@@ -122,8 +118,9 @@ TEST_F(PhishingClassifierDelegateTest, Navigation) {
// Reloading the same page should not trigger a reclassification.
// However, it will cancel any pending classification since the
// content is being replaced.
- EXPECT_CALL(*classifier, CancelPendingClassification());
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
+ EXPECT_CALL(*classifier, CancelPendingClassification()).Times(2);
+ GetMainFrame()->reload();
+ message_loop_.Run();
Mock::VerifyAndClearExpectations(classifier);
delegate->PageCaptured(page_text);
@@ -131,10 +128,9 @@ TEST_F(PhishingClassifierDelegateTest, Navigation) {
// the toplevel URL. This should cancel pending classification since the
// page content is changing, and not begin a new classification.
EXPECT_CALL(*classifier, CancelPendingClassification());
- child_frame->loadRequest(WebKit::WebURLRequest(GURL("http://sub2.com/")));
+ GetMainFrame()->firstChild()->loadRequest(
+ WebKit::WebURLRequest(GURL("http://sub2.com/")));
message_loop_.Run();
- EXPECT_CALL(*classifier, CancelPendingClassification());
- delegate->DidCommitProvisionalLoad(child_frame, true);
Mock::VerifyAndClearExpectations(classifier);
delegate->PageCaptured(page_text);
@@ -142,16 +138,13 @@ TEST_F(PhishingClassifierDelegateTest, Navigation) {
// not trigger a reclassification. A pending classification should not
// be cancelled, since the content is not changing.
LoadURL("http://host.com/#foo");
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
delegate->PageCaptured(page_text);
// Now load a new toplevel page, which should trigger another classification.
EXPECT_CALL(*classifier, CancelPendingClassification());
LoadURL("http://host2.com/");
- page_text = ASCIIToUTF16("dummy2");
- EXPECT_CALL(*classifier, CancelPendingClassification());
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
Mock::VerifyAndClearExpectations(classifier);
+ page_text = ASCIIToUTF16("dummy2");
EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _)).
WillOnce(DeleteArg<1>());
delegate->PageCaptured(page_text);
@@ -172,11 +165,9 @@ TEST_F(PhishingClassifierDelegateTest, PendingClassification) {
// Queue up a pending classification, cancel it, then queue up another one.
LoadURL("http://host.com/");
string16 page_text = ASCIIToUTF16("dummy");
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
delegate->PageCaptured(page_text);
LoadURL("http://host2.com/");
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
page_text = ASCIIToUTF16("dummy2");
delegate->PageCaptured(page_text);
@@ -205,14 +196,12 @@ TEST_F(PhishingClassifierDelegateTest, PendingClassification_Ref) {
// Queue up a pending classification, cancel it, then queue up another one.
LoadURL("http://host.com/");
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
string16 orig_page_text = ASCIIToUTF16("dummy");
string16 page_text = orig_page_text;
delegate->PageCaptured(page_text);
LoadURL("http://host.com/#foo");
page_text = orig_page_text;
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
delegate->PageCaptured(page_text);
// Now set a scorer, which should cause a classifier to be created and
@@ -242,10 +231,8 @@ TEST_F(PhishingClassifierDelegateTest, DetectedPhishingSite) {
responses_["http://host.com/"] = "<html><body>phish</body></html>";
EXPECT_CALL(*classifier, CancelPendingClassification());
LoadURL("http://host.com/");
- string16 page_text = ASCIIToUTF16("phish");
- EXPECT_CALL(*classifier, CancelPendingClassification());
- delegate->DidCommitProvisionalLoad(GetMainFrame(), true);
Mock::VerifyAndClearExpectations(classifier);
+ string16 page_text = ASCIIToUTF16("phish");
EXPECT_CALL(*classifier, BeginClassification(Pointee(page_text), _)).
WillOnce(DeleteArg<1>());
delegate->PageCaptured(page_text);
generated by cgit v1.1 at 2025-01-16 19:16:29 +0000