Safe Browsing phishing interstitial redesign.

chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc
index 792274b51e9f91dfc4eb0b82fc80ae363d58b984..f8a696f50b34ff06e4de425cfe636f2c5e7556fe 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_v2_test.cc
@@ -502,11 +502,14 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, MalwareDontProceed) {
 
   EXPECT_EQ(VISIBLE, GetVisibility("malware-icon"));
   EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
@@ -556,11 +559,14 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test,
 
   EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("subresource-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("phishing-icon"));
   EXPECT_EQ(VISIBLE, GetVisibility("check-report"));
   EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
   EXPECT_TRUE(Click("see-more-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
   EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
 
   EXPECT_TRUE(ClickAndWaitForDetach("back"));
@@ -670,3 +676,73 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, ReportingDisabled) {
       GURL(chrome::kAboutBlankURL),   // Back to "about:blank"
       chrome::GetActiveWebContents(browser())->GetURL());
 }
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingDontProceed) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_EQ(HIDDEN, GetVisibility("malware-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("subresource-icon"));
+  EXPECT_EQ(VISIBLE, GetVisibility("phishing-icon"));
+  EXPECT_EQ(HIDDEN, GetVisibility("check-report"));
+  EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("report-error-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("proceed"));
+  EXPECT_TRUE(Click("see-more-link"));
+  EXPECT_EQ(HIDDEN, GetVisibility("show-diagnostic-link"));
+  EXPECT_EQ(VISIBLE, GetVisibility("report-error-link"));
+  EXPECT_EQ(VISIBLE, GetVisibility("proceed"));
+
+  EXPECT_TRUE(ClickAndWaitForDetach("back"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+  EXPECT_EQ(
+      GURL(chrome::kAboutBlankURL),  // We are back to "about:blank".
+      chrome::GetActiveWebContents(browser())->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingProceed) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());

[Dan Beam, 2012/09/13 04:54:26]

maybe make a setup method here? this is the same code everywhere it looks
like...

[mattm, 2012/09/13 20:12:07]

Done.

+
+  EXPECT_TRUE(ClickAndWaitForDetach("proceed"));
+  AssertNoInterstitial(true);    // Assert the interstitial is gone

[Dan Beam, 2012/09/13 04:54:26]

nit: why 4 \s?

[mattm, 2012/09/13 20:12:07]

dunno, that's what all the other tests had. :p

fixed.

+  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingReportError) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_TRUE(ClickAndWaitForDetach("report-error-link"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+
+  // We are in the error reporting page.
+  EXPECT_EQ(
+      "/safebrowsing/report_error/",
+      chrome::GetActiveWebContents(browser())->GetURL().path());
+}
+
+IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageV2Test, PhishingLearnMore) {
+  GURL url = test_server()->GetURL(kEmptyPage);
+  AddURLResult(url, SafeBrowsingService::URL_PHISHING);
+
+  ui_test_utils::NavigateToURL(browser(), url);
+  ASSERT_TRUE(WaitForReady());
+
+  EXPECT_TRUE(ClickAndWaitForDetach("learn-more-link"));
+  AssertNoInterstitial(false);    // Assert the interstitial is gone
+
+  // We are in the help page.
+  EXPECT_EQ(
+      "/goodtoknow/online-safety/phishing/",
+       chrome::GetActiveWebContents(browser())->GetURL().path());
+}