PlzNavigate: Transmit referrer into FrameNavigationEntry.

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 521d4ea99fe9f3ab7d71a993c323f0fb3efa2aca..5924b5320090e498cd3a60a8ad8b0c8443655ab5 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -6759,6 +6759,57 @@ IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
 }
 
+// Check that the referrer is stored inside FrameNavigationEntry for subframes.
+IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
+                       RefererStoredForSubFrame) {
+  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
+    return;
+
+  const NavigationControllerImpl& controller =
+      static_cast<const NavigationControllerImpl&>(
+          shell()->web_contents()->GetController());
+
+  // Navigate to a page with an iframe.
+  GURL url(embedded_test_server()->GetURL(
+      "/navigation_controller/page_with_iframe_simple.html"));
+  EXPECT_TRUE(NavigateToURL(shell(), url));
+
+  EXPECT_EQ(1, controller.GetEntryCount());
+  NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
+
+  // Check that the FrameNavigationEntry's referrer.

[Charlie Reis, 2016/10/24 17:26:44]

nit: Drop "that"

+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_entry->referrer().url, url);
+}
+
+// Check that the referrer is stored inside FrameNavigationEntry for subframes
+// despite a redirection.
+IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
+                       RefererStoredForSubFrameWithRedirect) {

[Charlie Reis, 2016/10/24 17:26:44]

There's a fair amount of overhead to each browser test, with firing up a full
new instance of the browser.  Given how related these two cases are, I think
it's safe to combine them into the same test (one after the other).

+  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
+    return;
+
+  const NavigationControllerImpl& controller =
+      static_cast<const NavigationControllerImpl&>(
+          shell()->web_contents()->GetController());
+
+  // Navigate to a page with an iframe.
+  GURL url(embedded_test_server()->GetURL(
+      "/navigation_controller/page_with_iframe_redirect.html"));
+  EXPECT_TRUE(NavigateToURL(shell(), url));
+
+  EXPECT_EQ(1, controller.GetEntryCount());
+  NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
+
+  // Check that the FrameNavigationEntry's referrer.

[Charlie Reis, 2016/10/24 17:26:44]

nit: Drop "that"

+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_entry->referrer().url, url);
+}
+
 namespace {
 
 class RequestMonitoringNavigationBrowserTest : public ContentBrowserTest {