Fix race when reloading original URL

content/browser/frame_host/navigation_controller_impl_browsertest.cc

Index: content/browser/frame_host/navigation_controller_impl_browsertest.cc
diff --git a/content/browser/frame_host/navigation_controller_impl_browsertest.cc b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
index ba4a49d1d4de3f05005e651f220a64d46afd8550..f7dca5140a8512cd3bcf3a0feaab67ac08cc515c 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -5,6 +5,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/frame_navigation_entry.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
@@ -2130,4 +2131,76 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   ResourceDispatcherHost::Get()->SetDelegate(nullptr);
 }
 
+namespace {
+class RenderProcessKilledObserver : public WebContentsObserver {
+ public:
+  RenderProcessKilledObserver(WebContents* web_contents)
+      : WebContentsObserver(web_contents) {}
+  ~RenderProcessKilledObserver() override {}
+
+  void RenderProcessGone(base::TerminationStatus status) override {
+    CHECK_NE(status,
+             base::TerminationStatus::TERMINATION_STATUS_PROCESS_WAS_KILLED);
+  }
+};
+}
+
+// This tests for a race in ReloadOriginalRequest. Not crashing means that the

[Charlie Reis, 2015/07/14 22:23:10]

nit: This tests a race in ReloadOriginalRequest, where a cross-origin reload was
causing an in-flight replaceState to look like a cross-origin navigation, even
though it's in-page.  (The reload should not modify the underlying last
committed entry.)  Not crashing...

[lfg, 2015/07/14 22:47:27]

Done.

+// test is successful.
+IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest, ReloadOriginalRequest) {
+  GURL url(embedded_test_server()->GetURL(

[Charlie Reis, 2015/07/14 22:23:10]

nit: original_url

[lfg, 2015/07/14 22:47:27]

Done.

+      "/navigation_controller/simple_page_1.html"));
+  NavigateToURL(shell(), url);
+  FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
+                            ->GetFrameTree()
+                            ->root();
+  RenderProcessKilledObserver kill_observer(shell()->web_contents());
+
+  // Redirect.

[Charlie Reis, 2015/07/14 22:23:10]

nit: Redirect so that we can use ReloadOriginalRequest.

[lfg, 2015/07/14 22:47:27]

Done.

+  GURL foo_url(embedded_test_server()->GetURL(

[Charlie Reis, 2015/07/14 22:23:10]

nit: redirect_url

[lfg, 2015/07/14 22:47:27]

Done.

+      "foo.com", "/navigation_controller/simple_page_1.html"));
+  {
+    std::string script = "location.replace('" + foo_url.spec() + "');";
+    FrameNavigateParamsCapturer capturer(root);
+    EXPECT_TRUE(ExecuteScript(shell()->web_contents(), script));
+    capturer.Wait();
+    EXPECT_EQ(ui::PAGE_TRANSITION_LINK | ui::PAGE_TRANSITION_CLIENT_REDIRECT,
+              capturer.params().transition);
+    EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
+  }
+
+  // Modify an entry in the session history and reload the original request.
+  {
+    // We first send a replaceState() to the renderer, which will cause the
+    // renderer to send back a DidCommitProvisionalLoad. Immediatelly after,

[Charlie Reis, 2015/07/14 22:23:10]

nit: Immediately

[lfg, 2015/07/14 22:47:27]

Done.

+    // we send a ReloadOriginalRequest (which in this case is a different
+    // origin) and will also cause the renderer to commit the frame. In the
+    // end we verify that both navigations committed and that the URLs are
+    // correct.
+    std::string script = "history.replaceState({}, '', 'foo');";
+    root->render_manager()
+        ->current_frame_host()
+        ->ExecuteJavaScriptWithUserGestureForTests(base::UTF8ToUTF16(script));
+    EXPECT_FALSE(shell()->web_contents()->IsLoading());
+    shell()->web_contents()->GetController().ReloadOriginalRequestURL(false);
+    EXPECT_TRUE(shell()->web_contents()->IsLoading());

[Charlie Reis, 2015/07/14 22:23:10]

Also add:
EXPECT_EQ(redirect_url, shell()->web_contents()->GetLastCommittedURL());

[lfg, 2015/07/14 22:47:27]

Done.

+
+    // Wait until there's no more navigations.
+    GURL modified_url(embedded_test_server()->GetURL(
+        "foo.com", "/navigation_controller/foo"));
+    FrameNavigateParamsCapturer capturer(root);
+    capturer.set_wait_for_load(false);
+    capturer.set_navigations_remaining(2);
+    capturer.Wait();
+    EXPECT_EQ(2U, capturer.all_details().size());
+    EXPECT_EQ(modified_url, capturer.all_params()[0].url);
+    EXPECT_EQ(url, capturer.all_params()[1].url);
+    EXPECT_EQ(url, shell()->web_contents()->GetLastCommittedURL());

[Charlie Reis, 2015/07/14 22:23:10]

Yes, I like this approach.

[lfg, 2015/07/14 22:47:27]

Done.

+  }
+
+  // Make sure the renderer is still alive.
+  EXPECT_TRUE(
+      ExecuteScript(shell()->web_contents(), "console.log('Success');"));
+}
+
 }  // namespace content