Merge 145731 - Remember to set did_defer_ to true when deferring the request from

content/browser/renderer_host/resource_dispatcher_host_browsertest.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.
 
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 398 matching lines @@
   std::string redirect_script = "window.location='" +
       test_url.possibly_invalid_spec() + "';" +
       "window.domAutomationController.send(true);";
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       browser()->GetActiveWebContents()->GetRenderViewHost(),
       L"", ASCIIToWide(redirect_script), &success));
   EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
+                       CrossSiteNavigationErrorPage2) {
+  ASSERT_TRUE(test_server()->Start());
+
+  GURL url(test_server()->GetURL("files/title2.html"));
+  CheckTitleTest(url, "Title Of Awesomeness", 1);
+
+  // Navigate to a new cross-site URL that results in an error page.
+  // TODO(creis): If this causes crashes or hangs, it might be for the same
+  // reason as ErrorPageTest::DNSError.  See bug 1199491 and
+  // http://crbug.com/22877.
+  GURL failed_url = URLRequestFailedJob::GetMockHttpUrl(
+      net::ERR_NAME_NOT_RESOLVED);
+
+  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
+      browser(), failed_url, 2);
+  EXPECT_NE(ASCIIToUTF16("Title Of Awesomeness"),
+            browser()->GetActiveWebContents()->GetTitle());
+
+  // Repeat navigation.  We are testing that this completes.
+  ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(
+      browser(), failed_url, 2);
+  EXPECT_NE(ASCIIToUTF16("Title Of Awesomeness"),
+            browser()->GetActiveWebContents()->GetTitle());
+}
+
+IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossOriginRedirectBlocked) {
   // We expect the following URL requests from this test:
   // 1-  http://mock.http/cross-origin-redirect-blocked.html
   // 2-  http://mock.http/redirect-to-title2.html
   // 3-  http://mock.http/title2.html
   //
   // If the redirect in #2 were not blocked, we'd also see a request
   // for http://mock.http:4000/title2.html, and the title would be different.
   CheckTitleTest(GetMockURL("cross-origin-redirect-blocked.html"),
                  "Title Of More Awesomeness", 2);
 }
 
 // Tests that ResourceRequestInfoImpl is updated correctly on failed
 // requests, to prevent calling Read on a request that has already failed.
 // See bug 40250.
 IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest,
                        CrossSiteFailedRequest) {
   // Visit another URL first to trigger a cross-site navigation.
   GURL url(chrome::kTestNewTabURL);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Visit a URL that fails without calling ResourceDispatcherHost::Read.
   GURL broken_url("chrome://theme");
   CheckTitleTest(broken_url, "chrome://theme/ is not available", 1);
 }