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 468b01e573ac662adefd6400dc2e5486f22cc88a..4ab6e2bea2202a908aa4bce1899d2bf3576e444e 100644
--- a/content/browser/frame_host/render_frame_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -16,6 +16,7 @@
 #include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
+#include "content/common/navigation_params.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
@@ -39,6 +40,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 +389,48 @@ class RenderFrameHostManagerTest
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableBrowserSideNavigation);
   }
+
+  void SendRequestNavigation(const GURL& url,
+                                  FrameTreeNode* node) {

[Charlie Reis, 2014/09/19 23:12:32]

nit: Wrong indent.

[clamy, 2014/09/23 21:13:26]

Done.

+    SendRequestNavigationWithParameters(
+        url, node, Referrer(), PAGE_TRANSITION_LINK,
+        NavigationController::NO_RELOAD);
+  }
+
+  void SendRequestNavigationWithParameters(
+      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())));
+    NavigatorImpl* navigator = static_cast<NavigatorImpl*>(node->navigator());
+    scoped_ptr<CoreNavigationParams> core_params(new CoreNavigationParams);
+    scoped_ptr<CommitNavigationParams> commit_params(
+        new CommitNavigationParams);
+    RequestNavigationParams request_params;
+    navigator->MakeNavigationParamsForTest(*entry,
+                                           reload_type,
+                                           core_params.get(),
+                                           &request_params,
+                                           commit_params.get());
+    node->render_manager()->RequestNavigation(
+        core_params.Pass(), request_params, commit_params.Pass());
+  }
+
+  CoreNavigationParams* GetCoreNavigationParams(
+      RenderFrameHostManager* manager) {
+    return manager->core_navigation_params_.get();
+  }
+
  private:
   RenderFrameHostManagerTestWebUIControllerFactory factory_;
   scoped_ptr<FrameLifetimeConsistencyChecker> lifetime_checker_;
@@ -1698,6 +1742,8 @@ TEST_F(RenderFrameHostManagerTest,
 
 // PlzNavigate: Test that a proper NavigationRequest is created by
 // BeginNavigation.
+// Note that all PlzNavigate methods on the browser side require the use of the
+// flag kEnableBrowserSideNavigation.
 TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
@@ -1715,13 +1761,15 @@ TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
       contents()->GetFrameTree()->AddFrame(
           contents()->GetFrameTree()->root(), 14, "Child"));
 
+  RenderFrameHostManager* subframe_manager =
+      subframe_rfh->frame_tree_node()->render_manager();
+  SendRequestNavigation(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);
+  EXPECT_EQ(kUrl2, subframe_request->info().core_params.url);
   // First party for cookies url should be that of the main frame.
   EXPECT_EQ(
       kUrl1, subframe_request->info().first_party_for_cookies);
@@ -1729,12 +1777,15 @@ TEST_F(RenderFrameHostManagerTest, BrowserSideNavigationBeginNavigation) {
   EXPECT_TRUE(subframe_request->info().parent_is_main_frame);
   EXPECT_EQ(kFirstNavRequestID, subframe_request->navigation_request_id());
 
+  RenderFrameHostManager* main_frame_manager =
+      contents()->GetMainFrame()->frame_tree_node()->render_manager();
+  SendRequestNavigation(kUrl3, 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());
+  NavigationRequest* main_request =
+      GetNavigationRequestForRenderFrameManager(main_frame_manager);
   ASSERT_TRUE(main_request);
-  EXPECT_EQ(kUrl3, main_request->info().navigation_params.url);
+  EXPECT_EQ(kUrl3, main_request->info().core_params.url);
   EXPECT_EQ(kUrl3, main_request->info().first_party_for_cookies);
   EXPECT_TRUE(main_request->info().is_main_frame);
   EXPECT_FALSE(main_request->info().parent_is_main_frame);
@@ -1749,10 +1800,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();
+  SendRequestNavigation(kUrl, main_test_rfh()->frame_tree_node());
   NavigationRequest* main_request =
       GetNavigationRequestForRenderFrameManager(render_manager);
   // A NavigationRequest should have been generated.
@@ -1791,6 +1841,7 @@ TEST_F(RenderFrameHostManagerTest,
 
   EnableBrowserSideNavigation();
   // Navigate to a different site.
+  SendRequestNavigation(kUrl2, main_test_rfh()->frame_tree_node());
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* main_request =
       GetNavigationRequestForRenderFrameManager(render_manager);
@@ -1826,6 +1877,7 @@ TEST_F(RenderFrameHostManagerTest,
   EXPECT_EQ(kUrl0_site, main_test_rfh()->GetSiteInstance()->GetSiteURL());
 
   // Request navigation to the 1st URL and gather data.
+  SendRequestNavigation(kUrl1, main_test_rfh()->frame_tree_node());
   main_test_rfh()->SendBeginNavigationWithURL(kUrl1);
   NavigationRequest* request1 =
       GetNavigationRequestForRenderFrameManager(render_manager);
@@ -1833,6 +1885,7 @@ TEST_F(RenderFrameHostManagerTest,
   int64 request_id1 = request1->navigation_request_id();
 
   // Request navigation to the 2nd URL and gather more data.
+  SendRequestNavigation(kUrl2, main_test_rfh()->frame_tree_node());
   main_test_rfh()->SendBeginNavigationWithURL(kUrl2);
   NavigationRequest* request2 =
       GetNavigationRequestForRenderFrameManager(render_manager);
@@ -1854,4 +1907,54 @@ TEST_F(RenderFrameHostManagerTest,
   EXPECT_EQ(kUrl2_site, main_test_rfh()->GetSiteInstance()->GetSiteURL());
 }
 
+// PlzNavigate: Test that a reload navigation is properly signaled to the
+// renderer when the navigation can commit.
+TEST_F(RenderFrameHostManagerTest,
+       BrowserSideNavigationReload) {

[Charlie Reis, 2014/09/19 23:12:32]

Fits on one line?

[clamy, 2014/09/23 21:13:26]

Done.

+  const GURL kUrl("http://www.google.com/");
+  contents()->NavigateAndCommit(kUrl);
+
+  EnableBrowserSideNavigation();
+  RenderFrameHostManager* render_manager =
+      main_test_rfh()->frame_tree_node()->render_manager();
+  SendRequestNavigationWithParameters(
+      kUrl, main_test_rfh()->frame_tree_node(), Referrer(),
+      PAGE_TRANSITION_LINK, NavigationController::RELOAD);
+  contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl);
+  // A NavigationRequest should have been generated.
+  NavigationRequest* main_request =
+      GetNavigationRequestForRenderFrameManager(render_manager);
+  ASSERT_TRUE(main_request != NULL);
+  // Navigation parameters should have been generated.
+  CoreNavigationParams* navigation_params =
+      GetCoreNavigationParams(render_manager);
+  ASSERT_TRUE(navigation_params != NULL);
+  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD, navigation_params->navigation_type);
+  int page_id = contents()->GetMaxPageIDForSiteInstance(
+                    main_test_rfh()->GetSiteInstance()) +
+                1;

[Charlie Reis, 2014/09/19 23:12:32]

Move 1 to previous line?  (Same below)

[clamy, 2014/09/23 21:13:26]

Done (git cl format is weird sometimes).

+  main_test_rfh()->SendNavigate(page_id, kUrl);
+
+  // Now do a shift+reload.
+  SendRequestNavigationWithParameters(
+      kUrl,
+      main_test_rfh()->frame_tree_node(),
+      Referrer(),
+      PAGE_TRANSITION_LINK,
+      NavigationController::RELOAD_IGNORING_CACHE);
+  contents()->GetMainFrame()->SendBeginNavigationWithURL(kUrl);
+  // A NavigationRequest should have been generated.
+  main_request = GetNavigationRequestForRenderFrameManager(render_manager);
+  ASSERT_TRUE(main_request != NULL);
+  // Navigation parameters should have been generated.
+  navigation_params = GetCoreNavigationParams(render_manager);
+  ASSERT_TRUE(navigation_params != NULL);
+  EXPECT_EQ(FrameMsg_Navigate_Type::RELOAD_IGNORING_CACHE,
+            navigation_params->navigation_type);
+  page_id = contents()->GetMaxPageIDForSiteInstance(
+                main_test_rfh()->GetSiteInstance()) +
+            1;
+  main_test_rfh()->SendNavigate(page_id, kUrl);
+}
+
 }  // namespace content