PlzNavigate: improve tracking of improper subframe swap-out.

content/browser/frame_host/navigator_impl_unittest.cc

 // Copyright 2014 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/command_line.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/navigation_request.h"
@@ skipping 240 matching lines @@
   EXPECT_TRUE(request->browser_initiated());
   EXPECT_EQ(NavigationRequest::WAITING_FOR_RENDERER_RESPONSE, request->state());
   EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
 
   // Simulate a beforeUnload denial.
   main_test_rfh()->SendBeforeUnloadACK(false);
   EXPECT_FALSE(node->navigation_request());
   EXPECT_FALSE(GetSpeculativeRenderFrameHost(node));
 }
 
-// PlzNavigate: Test that a proper NavigationRequest is created by
-// RequestNavigation.
-TEST_F(NavigatorTestWithBrowserSideNavigation, BeginNavigation) {
+// PlzNavigate: Test that navigation state is properly maintained when
+// navigating simultaneously at the root frame and at a subframe levels.
+TEST_F(NavigatorTestWithBrowserSideNavigation,

[clamy, 2015/04/27 12:05:20]

Note that the original goal of this test is to check whether we create proper
NavigationRequests for root/subframe navigations. In particular, computing the
first_party_for_cookies/is_main_frame/parent_is_main_frame part. I'm not sure we
need to expend it.

+       NavigatingAtRootAndSubframeSimultaneously) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
   const GURL kUrl3("http://www.gmail.com/");
 
   contents()->NavigateAndCommit(kUrl1);
+  process()->sink().ClearMessages();
 
   // Add a subframe.
   FrameTreeNode* root_node = contents()->GetFrameTree()->root();
   TestRenderFrameHost* subframe_rfh = main_test_rfh()->AppendChild("Child");
   ASSERT_TRUE(subframe_rfh);
 
   // Start a navigation at the subframe.
   FrameTreeNode* subframe_node = subframe_rfh->frame_tree_node();
   RequestNavigation(subframe_node, kUrl2);
   NavigationRequest* subframe_request = subframe_node->navigation_request();
@@ skipping 45 matching lines @@
   // BeforeUnloadACK was received from the renderer so the navigation should
   // have started.
   EXPECT_EQ(NavigationRequest::STARTED, main_request->state());
 
   // Main frame navigation to a different site should use a speculative
   // RenderFrameHost.
   EXPECT_TRUE(GetSpeculativeRenderFrameHost(root_node));
 
   // As the main frame hasn't yet committed the subframe still exists. Thus, the
   // above situation regarding subframe navigations is valid here.
+  ASSERT_TRUE(subframe_node->navigation_request());
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSitePerProcess)) {
     EXPECT_TRUE(GetSpeculativeRenderFrameHost(subframe_node));
   } else {
     EXPECT_FALSE(GetSpeculativeRenderFrameHost(subframe_node));
   }
+
+  // Have the navigation commit for the root node's speculative RenderFrameHost.

[clamy, 2015/04/27 12:05:20]

This comment is misleading. If you want to simulate a full navigation commit,
then you need to add a DidNavigate at the end. This will destroy the subframe,
making the last check non-relevant.

+  scoped_refptr<ResourceResponse> response(new ResourceResponse);
+  main_loader->CallOnResponseStarted(response, MakeEmptyStream());
+  TestRenderFrameHost* speculative_root_rfh =
+      GetSpeculativeRenderFrameHost(root_node);
+  ASSERT_TRUE(speculative_root_rfh);
+  EXPECT_TRUE(DidRenderFrameHostRequestCommit(speculative_root_rfh));
+
+  // The subframe request is still there as the subframe still exists.
+  ASSERT_TRUE(subframe_node->navigation_request());
 }
 
 // PlzNavigate: Test that committing an HTTP 204 or HTTP 205 response cancels
 // the navigation.
 TEST_F(NavigatorTestWithBrowserSideNavigation, NoContent) {
   const GURL kUrl1("http://www.chromium.org/");
   const GURL kUrl2("http://www.google.com/");
 
   // Load a URL.
   contents()->NavigateAndCommit(kUrl1);
@@ skipping 769 matching lines @@
 
     SiteInstance* converted_instance_2 =
         ConvertToSiteInstance(rfhm, descriptor, unrelated_instance.get());
     // Should return |unrelated_instance| because its site matches and it is
     // unrelated to the current SiteInstance.
     EXPECT_EQ(unrelated_instance.get(), converted_instance_2);
   }
 }
 
 }  // namespace content