Allow SiteInstance for about:blank in new tab to be reused.

chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This test creates a fake safebrowsing service, where we can inject
 // malware and phishing urls.  It then uses a real browser to go to
 // these urls, and sends "goback" or "proceed" commands and verifies
 // they work.
 
 #include "base/bind.h"
@@ skipping 410 matching lines @@
   AssertNoInterstitial(false);   // Assert the interstitial is gone
   EXPECT_EQ(
       GURL(chrome::kAboutBlankURL),   // Back to "about:blank"
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL());
 }
 
 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()));
   SendCommand("\"proceed\"");    // Simulate the user clicking "proceed"
   observer.Wait();
   AssertNoInterstitial(true);    // Assert the interstitial is gone.
   EXPECT_EQ(
       url,
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL());
 }
@@ skipping 10 matching lines @@
       GURL(chrome::kAboutBlankURL),  // We are back to "about:blank".
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) {
   GURL url = test_server()->GetURL(kEmptyPage);
   AddURLResult(url, SafeBrowsingService::URL_PHISHING);
 
   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()));
   SendCommand("\"proceed\"");   // Simulate the user clicking "proceed".
   observer.Wait();
   AssertNoInterstitial(true);    // Assert the interstitial is gone
   EXPECT_EQ(
       url,
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) {
   GURL url = test_server()->GetURL(kEmptyPage);
   AddURLResult(url, SafeBrowsingService::URL_PHISHING);
 
   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()));
   SendCommand("\"reportError\"");   // Simulate the user clicking "report error"
   observer.Wait();
   AssertNoInterstitial(false);    // Assert the interstitial is gone
 
   // We are in the error reporting page.
   EXPECT_EQ(
       "/safebrowsing/report_error/",
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL().
         path());
 }
 
 IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest,
                        PhishingLearnMore) {
   GURL url = test_server()->GetURL(kEmptyPage);
   AddURLResult(url, SafeBrowsingService::URL_PHISHING);
 
   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()));
   SendCommand("\"learnMore\"");   // Simulate the user clicking "learn more"
   observer.Wait();
   AssertNoInterstitial(false);    // Assert the interstitial is gone
 
   // We are in the help page.
   EXPECT_EQ(
       "/support/bin/answer.py",
@@ skipping 65 matching lines @@
   SendCommand("\"proceed\"");  // Simulate the user clicking "back"
   AssertNoInterstitial(true);  // Assert the interstitial is gone
 
   EXPECT_EQ(
       url,
       browser()->GetSelectedTabContentsWrapper()->web_contents()->GetURL());
   AssertReportSent();
 }
 
 }  // namespace