PlzNavigate: implement CommitNavigation on the browser side

content/browser/frame_host/render_frame_host_manager_unittest.cc

Index: content/browser/frame_host/render_frame_host_manager_unittest.cc
diff --git a/content/browser/frame_host/render_frame_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index acf5f139c4767ecea696694d8bceea8537a41bcd..44e45240c7e247b3604264b52ae678eb57d459c3 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -39,6 +39,7 @@
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
+#include "net/base/load_flags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
@@ -387,6 +388,39 @@ class RenderFrameHostManagerTest
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableBrowserSideNavigation);
   }
+
+  void StartBrowserSideNavigation(const GURL& url,
+                                  FrameTreeNode* node) {
+    StartBrowserSideNavigationWithParameters(
+        url, node, Referrer(), PAGE_TRANSITION_LINK,
+        NavigationController::NO_RELOAD);
+  }
+
+  void StartBrowserSideNavigationWithParameters(
+      const GURL& url,
+      FrameTreeNode* node,
+      const Referrer& referrer,
+      PageTransition transition_type,
+      NavigationController::ReloadType reload_type) {
+    scoped_ptr<NavigationEntryImpl> entry(
+        NavigationEntryImpl::FromNavigationEntry(
+            NavigationController::CreateNavigationEntry(
+            url, referrer, transition_type, false, std::string(),
+            controller().GetBrowserContext())));
+    FrameMsg_Navigate_Params navigate_params;
+    NavigatorImpl* navigator = static_cast<NavigatorImpl*>(node->navigator());
+    navigator->MakeNavigateParams(
+        *entry, reload_type, base::TimeTicks::Now(), &navigate_params);
+    node->render_manager()->RequestNavigation(
+        navigator->MakeCommitNavigationParams(*entry, reload_type),
+        navigate_params);
+  }
+
+  FrameMsg_CommitNavigation_Params* GetCommitParams(
+      RenderFrameHostManager* manager) {
+    return manager->commit_navigation_params_.get();
+  }
+
  private:
   RenderFrameHostManagerTestWebUIControllerFactory factory_;
   scoped_ptr<FrameLifetimeConsistencyChecker> lifetime_checker_;
@@ -1710,11 +1744,13 @@ TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
       contents()->GetFrameTree()->AddFrame(
           contents()->GetFrameTree()->root(), 14, "Child"));
 
+  RenderFrameHostManager* subframe_manager =
+      subframe_rfh->frame_tree_node()->render_manager();
+  StartBrowserSideNavigation(kUrl2, subframe_rfh->frame_tree_node());
   // Simulate a BeginNavigation IPC on the subframe.
   subframe_rfh->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* subframe_request =
-      GetNavigationRequestForRenderFrameManager(
-          subframe_rfh->frame_tree_node()->render_manager());
+      GetNavigationRequestForRenderFrameManager(subframe_manager);
   ASSERT_TRUE(subframe_request);
   EXPECT_EQ(kUrl2, subframe_request->info().navigation_params.url);
   // First party for cookies url should be that of the main frame.
@@ -1723,10 +1759,14 @@ TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
   EXPECT_FALSE(subframe_request->info().is_main_frame);
   EXPECT_TRUE(subframe_request->info().parent_is_main_frame);
 
+  RenderFrameHostManager* main_frame_manager =
+      contents()->GetMainFrame()->frame_tree_node()->render_manager();
+  StartBrowserSideNavigation(
+      kUrl2, contents()->GetMainFrame()->frame_tree_node());
   // Simulate a BeginNavigation IPC on the main frame.
   contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl3);
   NavigationRequest* main_request = GetNavigationRequestForRenderFrameManager(
-      contents()->GetMainFrame()->frame_tree_node()->render_manager());
+      main_frame_manager);
   ASSERT_TRUE(main_request);
   EXPECT_EQ(kUrl3, main_request->info().navigation_params.url);
   EXPECT_EQ(kUrl3, main_request->info().first_party_for_cookies);
@@ -1742,10 +1782,9 @@ TEST_F(RenderFrameHostManagerTest,
 
   EnableBrowserSideNavigation();
   EXPECT_FALSE(main_test_rfh()->render_view_host()->IsRenderViewLive());
-  contents()->GetController().LoadURL(
-      kUrl, Referrer(), PAGE_TRANSITION_LINK, std::string());
   RenderFrameHostManager* render_manager =
       main_test_rfh()->frame_tree_node()->render_manager();
+  StartBrowserSideNavigation(kUrl, main_test_rfh()->frame_tree_node());
   NavigationRequest* main_request =
       GetNavigationRequestForRenderFrameManager(render_manager);
   // A NavigationRequest should have been generated.
@@ -1781,6 +1820,7 @@ TEST_F(RenderFrameHostManagerTest,
 
   EnableBrowserSideNavigation();
   // Navigate to a different site.
+  StartBrowserSideNavigation(kUrl2, main_test_rfh()->frame_tree_node());
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* main_request =
       GetNavigationRequestForRenderFrameManager(render_manager);
@@ -1793,4 +1833,47 @@ TEST_F(RenderFrameHostManagerTest,
   EXPECT_NE(main_test_rfh(), rfh);
 }
 
+// PlzNavigate: Test that a reload navigation is properly signaled to the
+// renderer when the navigation can commit.
+TEST_F(RenderFrameHostManagerTest,
+       BrowserSideNavigationReload) {
+  const GURL kUrl("http://www.google.com/");
+
+  EnableBrowserSideNavigation();
+  RenderFrameHostManager* render_manager =
+      main_test_rfh()->frame_tree_node()->render_manager();
+  StartBrowserSideNavigationWithParameters(
+      kUrl, main_test_rfh()->frame_tree_node(), Referrer(),
+      PAGE_TRANSITION_LINK, NavigationController::RELOAD);
+  // A NavigationRequest should have been generated.
+  NavigationRequest* main_request =
+      GetNavigationRequestForRenderFrameManager(render_manager);
+  ASSERT_TRUE(main_request != NULL);
+  EXPECT_EQ(net::LOAD_NORMAL | net::LOAD_VALIDATE_CACHE,
+            main_request->info().navigation_params.load_flags);
+  // CommitNavigation parameters should have been generated.
+  FrameMsg_CommitNavigation_Params* commit_navigation_params =
+      GetCommitParams(render_manager);
+  ASSERT_TRUE(commit_navigation_params != NULL);
+  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD,
+            commit_navigation_params->navigation_type);
+
+  // Now do a shift+reload.
+  StartBrowserSideNavigationWithParameters(
+      kUrl, main_test_rfh()->frame_tree_node(), Referrer(),
+      PAGE_TRANSITION_LINK, NavigationController::RELOAD_IGNORING_CACHE);
+  // A NavigationRequest should have been generated.
+  main_request =
+      GetNavigationRequestForRenderFrameManager(render_manager);
+  ASSERT_TRUE(main_request != NULL);
+  EXPECT_EQ(net::LOAD_NORMAL | net::LOAD_BYPASS_CACHE,
+            main_request->info().navigation_params.load_flags);
+  // CommitNavigation parameters should have been generated.
+  commit_navigation_params =
+      GetCommitParams(render_manager);
+  ASSERT_TRUE(commit_navigation_params != NULL);
+  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE,
+            commit_navigation_params->navigation_type);
+}
+
 }  // namespace content