PlzNavigate: Transmit referrer into FrameNavigationEntry.

content/browser/frame_host/navigation_controller_impl_browsertest.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 "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
@@ skipping 6741 matching lines @@
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
   histogram.ExpectTotalCount(kReloadMainResourceToReloadMetricName, 3);
 
   controller.ReloadToRefreshContent(false);
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   histogram.ExpectTotalCount(kReloadToReloadMetricName, 4);
   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 {
  public:
   RequestMonitoringNavigationBrowserTest() : weak_factory_(this) {}
 
   const net::test_server::HttpRequest* FindAccumulatedRequest(
       const GURL& url_to_find) {
     // net::test_server::HttpRequest::GetURL hardcodes "http://localhost/" part.
     GURL::Replacements replacements;
@@ skipping 102 matching lines @@
   // Verify that the extra header was NOT present for the subresource.
   const net::test_server::HttpRequest* image_request =
       FindAccumulatedRequest(image_url);
   ASSERT_TRUE(image_request);
   EXPECT_THAT(image_request->headers,
               testing::Not(testing::Contains(
                   testing::Key("X-ExtraHeadersVsSubresources"))));
 }
 
 }  // namespace content