Clean up unload-related state after the ack is received.

content/browser/renderer_host/render_view_host_manager_browsertest.cc

Index: content/browser/renderer_host/render_view_host_manager_browsertest.cc
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 351019a73fb2e4b7ce5359ec3ce285255d9f53eb..b1f774389acead1c477fc326ceeafd805ee4c301 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
-  EXPECT_EQ(L"Title Of Awesomeness",
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"),
       browser()->GetSelectedTabContents()->GetTitle());
 
   // Should have a new SiteInstance.
@@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Opens in new tab.
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
-  EXPECT_EQ(L"Title Of Awesomeness",
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"),
       browser()->GetSelectedTabContents()->GetTitle());
 
   // Should have the same SiteInstance.
@@ -175,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   // Opens in same tab.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(0, browser()->selected_index());
-  EXPECT_EQ(L"Title Of Awesomeness",
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"),
       browser()->GetSelectedTabContents()->GetTitle());
 
   // Should have the same SiteInstance.
@@ -235,6 +235,8 @@ class BrowserClosedObserver : public NotificationObserver {
       case NotificationType::BROWSER_CLOSED:
         MessageLoopForUI::current()->Quit();
         break;
+      default:

[Paweł Hajdan Jr., 2011/03/24 16:37:22]

Do you want NOTREACHED in the default case?

[Charlie Reis, 2011/03/24 22:46:03]

Sure.  I've also fixed it as part of http://codereview.chromium.org/6730016/,
which I plan to land first.

+        break;
     }
   }
 
@@ -275,3 +277,61 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   browser()->CloseWindow();
   BrowserClosedObserver wait_for_close(browser());
 }
+
+// Test for crbug.com/76666.  A cross-site navigation that fails with a 204
+// error should not make us ignore future renderer-initiated navigations.
+IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
+  // Start two servers with different sites.
+  ASSERT_TRUE(test_server()->Start());
+  net::TestServer https_server_(

[Paweł Hajdan Jr., 2011/03/24 16:37:22]

nit: Remove underscore from the end of variable name ( _ ).

[Charlie Reis, 2011/03/24 22:46:03]

Done.

+      net::TestServer::TYPE_HTTPS,
+      FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+  ASSERT_TRUE(https_server_.Start());
+
+  // Load a page with links that open in a new window.
+  // The links will point to the HTTPS server.
+  std::string replacement_path;
+  ASSERT_TRUE(GetFilePathWithHostAndPortReplacement(
+      "files/click-noreferrer-links.html",
+      https_server_.host_port_pair(),
+      &replacement_path));
+  ui_test_utils::NavigateToURL(browser(),
+                               test_server()->GetURL(replacement_path));
+
+  // Get the original SiteInstance for later comparison.
+  scoped_refptr<SiteInstance> orig_site_instance(
+      browser()->GetSelectedTabContents()->GetSiteInstance());
+  EXPECT_TRUE(orig_site_instance != NULL);
+
+  // Load a cross-site page that fails with a 204 error.
+  ui_test_utils::NavigateToURL(browser(), https_server_.GetURL("nocontent"));
+
+  // We should still be looking at the normal page.
+  scoped_refptr<SiteInstance> post_nav_site_instance(
+      browser()->GetSelectedTabContents()->GetSiteInstance());
+  EXPECT_EQ(orig_site_instance, post_nav_site_instance);
+  EXPECT_EQ(ASCIIToUTF16("Click noreferrer links"),
+      browser()->GetSelectedTabContents()->GetTitle());
+
+  // Renderer-initiated navigations should work.
+  bool success = false;
+  EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+      browser()->GetSelectedTabContents()->render_view_host(), L"",
+      L"window.domAutomationController.send(clickNoRefLink());",
+      &success));
+  EXPECT_TRUE(success);
+  // Wait for the cross-site transition to finish.
+  ui_test_utils::WaitForLoadStop(
+      &(browser()->GetSelectedTabContents()->controller()));
+
+  // Opens in same tab.
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(0, browser()->selected_index());
+  EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"),
+      browser()->GetSelectedTabContents()->GetTitle());

[Charlie Reis, 2011/03/24 22:46:03]

I've now fixed the flakiness around this, too (as uncovered in the other CL).

+
+  // Should have the same SiteInstance.
+  scoped_refptr<SiteInstance> noref_site_instance(
+      browser()->GetSelectedTabContents()->GetSiteInstance());
+  EXPECT_EQ(orig_site_instance, noref_site_instance);
+}