[bfcache] Disable for RenderFrameHostManagerTest.LastCommittedOrigin

This test is interested in the state of documents as they're deleted
during navigation.

Change-Id: I4db86fb97d45771aecf33f8a7afdc93c00602d21
Bug: 990354
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1733526
Commit-Queue: Lowell Manners <lowell@chromium.org>
Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685530}

content/browser/back_forward_cache_browsertest.cc

@@ -75,6 +75,8 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, Basic) {
   ASSERT_TRUE(embedded_test_server()->Start());
   const GURL url_a(embedded_test_server()->GetURL("a.com", "/title1.html"));
   const GURL url_b(embedded_test_server()->GetURL("b.com", "/title1.html"));
+  const url::Origin origin_a = url::Origin::Create(url_a);
+  const url::Origin origin_b = url::Origin::Create(url_b);
 
   // 1) Navigate to A.
   EXPECT_TRUE(NavigateToURL(shell(), url_a));
@@ -88,6 +90,8 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, Basic) {
   EXPECT_FALSE(delete_rfh_a.deleted());
   EXPECT_TRUE(rfh_a->is_in_back_forward_cache());
   EXPECT_EQ(rfh_a->GetVisibilityState(), PageVisibilityState::kHidden);
+  EXPECT_EQ(origin_a, rfh_a->GetLastCommittedOrigin());
+  EXPECT_EQ(origin_b, rfh_b->GetLastCommittedOrigin());
   EXPECT_FALSE(rfh_b->is_in_back_forward_cache());
   EXPECT_EQ(rfh_b->GetVisibilityState(), PageVisibilityState::kVisible);
 
@@ -96,6 +100,8 @@ IN_PROC_BROWSER_TEST_F(BackForwardCacheBrowserTest, Basic) {
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
   EXPECT_FALSE(delete_rfh_a.deleted());
   EXPECT_FALSE(delete_rfh_b.deleted());
+  EXPECT_EQ(origin_a, rfh_a->GetLastCommittedOrigin());
+  EXPECT_EQ(origin_b, rfh_b->GetLastCommittedOrigin());
   EXPECT_EQ(rfh_a, current_frame_host());
   EXPECT_FALSE(rfh_a->is_in_back_forward_cache());
   EXPECT_EQ(rfh_a->GetVisibilityState(), PageVisibilityState::kVisible);

content/browser/frame_host/render_frame_host_manager_browsertest.cc

@@ -193,6 +193,13 @@ class RenderFrameHostManagerTest : public ContentBrowserTest {
     host_resolver()->AddRule("*", "127.0.0.1");
   }
 
+  void DisableBackForwardCache() const {
+    return static_cast<WebContentsImpl*>(shell()->web_contents())
+        ->GetController()
+        .back_forward_cache()
+        .DisableForTesting();
+  }
+
   void StartServer() {
     ASSERT_TRUE(embedded_test_server()->Start());
 
@@ -3755,6 +3762,11 @@ IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
 // See https://crbug.com/590035.
 IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, LastCommittedOrigin) {
   StartEmbeddedServer();
+
+  // Disable the back-forward cache so that documents are always deleted when
+  // navigating.
+  DisableBackForwardCache();
+
   GURL url_a(embedded_test_server()->GetURL("a.com", "/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url_a));
 

testing/buildbot/filters/bfcache.content_browsertests.filter

@@ -73,7 +73,6 @@
 # Test expects the RenderFrameHost to be deleted after a navigation. It is now
 # stored into the BackForwardCache instead. It isn't deleted.
 -RenderFrameHostManagerTest.CleanupOnCrossProcessNavigation
--RenderFrameHostManagerTest.LastCommittedOrigin
 -SitePerProcessBrowserTest.PendingDeletionCheckCompletedOnSubtree
 -SitePerProcessBrowserTest.SlowUnloadHandlerInIframe
 -WebContentsBindingSetBrowserTest.CloseOnFrameDeletion