chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc - Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years 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/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

index 8433c4dc5ad22d9d4a0a963ba7e85d519d0aed0e..b7e54d337f8c03030001080c4e577f624d99b099 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

@@ -423,7 +423,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) {

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

SendCommand("\"proceed\""); // Simulate the user clicking "proceed"

observer.Wait();

AssertNoInterstitial(true); // Assert the interstitial is gone.

@@ -452,7 +452,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) {

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

SendCommand("\"proceed\""); // Simulate the user clicking "proceed".

observer.Wait();

AssertNoInterstitial(true); // Assert the interstitial is gone

@@ -469,7 +469,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) {

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

SendCommand("\"reportError\""); // Simulate the user clicking "report error"

observer.Wait();

AssertNoInterstitial(false); // Assert the interstitial is gone

@@ -490,7 +490,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,

content::NOTIFICATION_LOAD_STOP,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

SendCommand("\"learnMore\""); // Simulate the user clicking "learn more"

observer.Wait();

AssertNoInterstitial(false); // Assert the interstitial is gone

@@ -511,7 +511,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeDontProceed) {

content::NOTIFICATION_NAV_ENTRY_COMMITTED,

content::Source<NavigationController>(

&browser()->GetSelectedTabContentsWrapper()->tab_contents()->

- GetController()));

+ controller()));

SendCommand("\"takeMeBack\""); // Simulate the user clicking "back"

observer.Wait();

AssertNoInterstitial(false); // Assert the interstitial is gone