Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3029)

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

Issue 9264049: Allow SiteInstance for about:blank in new tab to be reused. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix spacing. Created 8 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 1709ebf8d920a92a373cbe11ef14e446dad2cd9b..f1b01553fb68b816668329a42d441b472edb6f81 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -428,9 +428,11 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) {
GURL url = test_server()->GetURL(kEmptyPage);
AddURLResult(url, SafeBrowsingService::URL_MALWARE);
+ // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
+ // event that clears the interstitial. We wait for DidNavigate instead.
ui_test_utils::NavigateToURL(browser(), url);
ui_test_utils::WindowedNotificationObserver observer(
- content::NOTIFICATION_LOAD_STOP,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
@@ -461,8 +463,10 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) {
ui_test_utils::NavigateToURL(browser(), url);
+ // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
+ // event that clears the interstitial. We wait for DidNavigate instead.
ui_test_utils::WindowedNotificationObserver observer(
- content::NOTIFICATION_LOAD_STOP,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
@@ -480,8 +484,10 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) {
ui_test_utils::NavigateToURL(browser(), url);
+ // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
+ // event that clears the interstitial. We wait for DidNavigate instead.
ui_test_utils::WindowedNotificationObserver observer(
- content::NOTIFICATION_LOAD_STOP,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
@@ -503,8 +509,10 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
ui_test_utils::NavigateToURL(browser(), url);
+ // Note: NOTIFICATION_LOAD_STOP may come before or after the DidNavigate
+ // event that clears the interstitial. We wait for DidNavigate instead.
ui_test_utils::WindowedNotificationObserver observer(
- content::NOTIFICATION_LOAD_STOP,
+ content::NOTIFICATION_NAV_ENTRY_COMMITTED,
content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->web_contents()->
GetController()));
« no previous file with comments | « no previous file | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698