Revert of OOPIF: Fix subframe back/forward after recreating FTNs.

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 b6618baf0903345da2feea086a040c9473b74465..5dec7a88a0665071b5a302f8e3eb215b62b0cda2 100644
--- a/content/browser/frame_host/navigation_controller_impl_browsertest.cc
+++ b/content/browser/frame_host/navigation_controller_impl_browsertest.cc
@@ -728,7 +728,7 @@
   // ... and replace it with a failed load.
   // TODO(creis): Make this be NEW_PAGE along with the other location.replace
   // cases.  There isn't much impact to having this be EXISTING_PAGE for now.
-  // See https://crbug.com/596707.
+  // See https://crbug.com/317872.
   {
     FrameNavigateParamsCapturer capturer(root);
     NavigateToURLAndReplace(shell(), error_url);
@@ -971,7 +971,7 @@
   {
     // location.replace().
     // TODO(creis): Change this to be NEW_PAGE with replacement in
-    // https://crbug.com/596707.
+    // https://crbug.com/317872.
     FrameNavigateParamsCapturer capturer(root);
     GURL frame_url(embedded_test_server()->GetURL(
         "/navigation_controller/simple_page_1.html"));
@@ -2284,9 +2284,6 @@
     EXPECT_EQ(0U, entry4->root_node()->children.size());
   }
 
-  // Inject a JS value so that we can check for it later.
-  EXPECT_TRUE(content::ExecuteScript(root->current_frame_host(), "foo=3;"));
-
   // 7. Go back again, to the data URL in the nested iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
@@ -2316,15 +2313,6 @@
   } else {
     // There are no subframe FrameNavigationEntries by default.
     EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
-
-  // Verify that we did not reload the main frame. See https://crbug.com/586234.
-  {
-    int value = 0;
-    EXPECT_TRUE(ExecuteScriptAndExtractInt(root->current_frame_host(),
-                                           "domAutomationController.send(foo)",
-                                           &value));
-    EXPECT_EQ(3, value);
   }
 
   // 8. Go back again, to the data URL in the first subframe.
@@ -2722,76 +2710,6 @@
   EXPECT_EQ(named_subframe_name, foo_subframe_entry->frame_unique_name());
 }
 
-// Ensures that FrameNavigationEntries for dynamically added iframes can be
-// found correctly when cloning them during a transfer.  If we don't look for
-// them based on unique name in AddOrUpdateFrameEntry, the FrameTreeNode ID
-// mismatch will cause us to create a second FrameNavigationEntry during the
-// transfer.  Later, we'll find the wrong FrameNavigationEntry (the earlier one
-// from the clone which still has a PageState), and this will cause the renderer
-// to crash in NavigateInternal because the PageState is present but the page_id
-// is -1 (similar to https://crbug.com/568703).  See https://crbug.com/568768.
-IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
-                       FrameNavigationEntry_RepeatCreatedFrame) {
-  NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
-      shell()->web_contents()->GetController());
-
-  // 1. Navigate the main frame.
-  GURL url(embedded_test_server()->GetURL(
-      "/navigation_controller/page_with_links.html"));
-  EXPECT_TRUE(NavigateToURL(shell(), url));
-  FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
-                            ->GetFrameTree()
-                            ->root();
-  SiteInstance* main_site_instance =
-      root->current_frame_host()->GetSiteInstance();
-
-  // 2. Add a cross-site subframe.
-  GURL frame_url(embedded_test_server()->GetURL(
-      "foo.com", "/navigation_controller/simple_page_1.html"));
-  std::string script = "var iframe = document.createElement('iframe');"
-                       "iframe.src = '" + frame_url.spec() + "';"
-                       "document.body.appendChild(iframe);";
-  {
-    LoadCommittedCapturer capturer(shell()->web_contents());
-    EXPECT_TRUE(ExecuteScript(root->current_frame_host(), script));
-    capturer.Wait();
-    EXPECT_EQ(ui::PAGE_TRANSITION_AUTO_SUBFRAME, capturer.transition_type());
-  }
-
-  FrameTreeNode* subframe = root->child_at(0);
-  if (AreAllSitesIsolatedForTesting()) {
-    EXPECT_NE(main_site_instance,
-              subframe->current_frame_host()->GetSiteInstance());
-  }
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    FrameNavigationEntry* subframe_entry =
-        controller.GetLastCommittedEntry()->GetFrameEntry(subframe);
-    EXPECT_EQ(frame_url, subframe_entry->url());
-  }
-
-  // 3. Reload the main frame.
-  {
-    FrameNavigateParamsCapturer capturer(root);
-    controller.Reload(false);
-    capturer.Wait();
-    EXPECT_EQ(ui::PAGE_TRANSITION_RELOAD, capturer.params().transition);
-    EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
-    EXPECT_FALSE(capturer.details().is_in_page);
-  }
-
-  // 4. Add the iframe again.
-  {
-    LoadCommittedCapturer capturer(shell()->web_contents());
-    EXPECT_TRUE(ExecuteScript(root->current_frame_host(), script));
-    capturer.Wait();
-    EXPECT_EQ(ui::PAGE_TRANSITION_AUTO_SUBFRAME, capturer.transition_type());
-  }
-  if (AreAllSitesIsolatedForTesting()) {
-    EXPECT_NE(main_site_instance,
-              root->child_at(0)->current_frame_host()->GetSiteInstance());
-  }
-}
-
 // Verifies that item sequence numbers and document sequence numbers update
 // properly for main frames and subframes.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,