Start removing UseSubframeNavigationEntries from tests.

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 181 matching lines @@
     // Load data, not loaddatawithbaseurl.
     EXPECT_TRUE(NavigateToURL(shell(), data_url2));
     same_tab_observer.Wait();
   }
 
   // Go back.
   TestNavigationObserver back_load_observer(shell()->web_contents());
   controller.GoBack();
   back_load_observer.Wait();
 
-  // Check title.
-  // TODO(creis): The default navigation path incorrectly loads the history_url
-  // and claims it loaded the data_url (due to a bug where GoToEntry does not
-  // handle this case).  This is confusing.  When using subframe
-  // FrameNavigationEntries, we load the data URL when going back, as expected.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    EXPECT_EQ("One", base::UTF16ToUTF8(shell()->web_contents()->GetTitle()));
-  else
-    EXPECT_EQ("form", base::UTF16ToUTF8(shell()->web_contents()->GetTitle()));
+  // Check title.  We should load the data URL when going back.
+  EXPECT_EQ("One", base::UTF16ToUTF8(shell()->web_contents()->GetTitle()));
 
   // Verify the last committed NavigationEntry.
   NavigationEntryImpl* back_entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(base_url, back_entry->GetBaseURLForDataURL());
   EXPECT_EQ(history_url, back_entry->GetVirtualURL());
   EXPECT_EQ(history_url, back_entry->GetHistoryURLForDataURL());
   EXPECT_EQ(data_url1, back_entry->GetOriginalRequestURL());
   EXPECT_EQ(data_url1, back_entry->GetURL());
 
   EXPECT_EQ(data_url1,
@@ skipping 1452 matching lines @@
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // Check last committed NavigationEntry.
   EXPECT_EQ(1, controller.GetEntryCount());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   FrameNavigationEntry* root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should now have one blank subframe FrameNavigationEntry, but
-    // this does not count as committing a real load.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->frame_entry.get();
-    EXPECT_EQ(about_blank_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // Verify subframe entries.  The entry should now have one blank subframe
+  // FrameNavigationEntry, but this does not count as committing a real load.
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(about_blank_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(0)->has_committed_real_load());
 
   // 1a. A nested iframe with no URL should also create a subframe entry but not
   // count as a real load.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The nested entry should have one blank subframe FrameNavigationEntry, but
-    // this does not count as committing a real load.
-    ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->children[0]->frame_entry.get();
-    EXPECT_EQ(about_blank_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // Verify subframe entries.  The nested entry should have one blank subframe
+  // FrameNavigationEntry, but this does not count as committing a real load.
+  ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
+  frame_entry = entry->root_node()->children[0]->children[0]->frame_entry.get();
+  EXPECT_EQ(about_blank_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(0)->child_at(0)->has_committed_real_load());
 
   // 2. Create another iframe with an explicit about:blank URL.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = 'about:blank';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // Check last committed NavigationEntry.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The new entry should have one blank subframe FrameNavigationEntry, but
-    // this does not count as committing a real load.
-    ASSERT_EQ(2U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[1]->frame_entry.get();
-    EXPECT_EQ(about_blank_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // Verify subframe entries.  The new entry should have one blank subframe
+  // FrameNavigationEntry, but this does not count as committing a real load.
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  frame_entry = entry->root_node()->children[1]->frame_entry.get();
+  EXPECT_EQ(about_blank_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(1)->has_committed_real_load());
 
   // 3. A real same-site navigation in the nested iframe should be AUTO.
   GURL frame_url(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   {
     LoadCommittedCapturer capturer(root->child_at(0)->child_at(0));
     std::string script = "var frames = document.getElementsByTagName('iframe');"
                          "frames[0].src = '" + frame_url.spec() + "';";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // Check last committed NavigationEntry.  It should have replaced the previous
   // frame entry in the original NavigationEntry.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should still have one nested subframe FrameNavigationEntry.
-    ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->children[0]->frame_entry.get();
-    EXPECT_EQ(frame_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should still have one nested subframe FrameNavigationEntry.
+  ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
+  frame_entry = entry->root_node()->children[0]->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(0)->has_committed_real_load());
   EXPECT_TRUE(root->child_at(0)->child_at(0)->has_committed_real_load());
   EXPECT_FALSE(root->child_at(1)->has_committed_real_load());
 
   // 4. A real cross-site navigation in the second iframe should be AUTO.
   GURL foo_url(embedded_test_server()->GetURL(
       "foo.com", "/navigation_controller/simple_page_2.html"));
   {
     LoadCommittedCapturer capturer(root->child_at(1));
     std::string script = "var frames = document.getElementsByTagName('iframe');"
                          "frames[1].src = '" + foo_url.spec() + "';";
     EXPECT_TRUE(ExecuteScript(root, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // Check last committed NavigationEntry.
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should still have two subframe FrameNavigationEntries.
-    ASSERT_EQ(2U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[1]->frame_entry.get();
-    EXPECT_EQ(foo_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should still have two subframe FrameNavigationEntries.
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  frame_entry = entry->root_node()->children[1]->frame_entry.get();
+  EXPECT_EQ(foo_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(0)->has_committed_real_load());
   EXPECT_TRUE(root->child_at(0)->child_at(0)->has_committed_real_load());
   EXPECT_TRUE(root->child_at(1)->has_committed_real_load());
 
   // 5. A new navigation to about:blank in the nested frame should count as a
   // real load, since that frame has already committed a real load and this is
   // not the initial blank page.
   {
     LoadCommittedCapturer capturer(root->child_at(0)->child_at(0));
     std::string script = "var frames = document.getElementsByTagName('iframe');"
                          "frames[0].src = 'about:blank';";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
   }
 
   // This should have created a new NavigationEntry.
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_NE(entry, controller.GetLastCommittedEntry());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(2U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry2->root_node()->children[0]->children[0]->frame_entry.get();
-    EXPECT_EQ(about_blank_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // Verify subframe entries.
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  frame_entry =
+      entry2->root_node()->children[0]->children[0]->frame_entry.get();
+  EXPECT_EQ(about_blank_url, frame_entry->url());
   EXPECT_FALSE(root->child_at(0)->has_committed_real_load());
   EXPECT_TRUE(root->child_at(0)->child_at(0)->has_committed_real_load());
   EXPECT_TRUE(root->child_at(1)->has_committed_real_load());
 
   // Check the end result of the frame tree.
   if (AreAllSitesIsolatedForTesting()) {
     FrameTreeVisualizer visualizer;
     EXPECT_EQ(
         " Site A ------------ proxies for B\n"
         "   |--Site A ------- proxies for B\n"
@@ skipping 232 matching lines @@
   }
 
   // Check last committed NavigationEntry.
   EXPECT_EQ(1, controller.GetEntryCount());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   FrameNavigationEntry* root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
   EXPECT_FALSE(controller.GetPendingEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should now have a subframe FrameNavigationEntry.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->frame_entry.get();
-    EXPECT_EQ(frame_url, frame_entry->url());
-    EXPECT_TRUE(root->child_at(0)->has_committed_real_load());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should now have a subframe FrameNavigationEntry.
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_url, frame_entry->url());
+  EXPECT_TRUE(root->child_at(0)->has_committed_real_load());
 
   // 2. Create a second, initially cross-site iframe.
   GURL foo_url(embedded_test_server()->GetURL(
       "foo.com", "/navigation_controller/simple_page_1.html"));
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + foo_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // The last committed NavigationEntry shouldn't have changed.
   EXPECT_EQ(1, controller.GetEntryCount());
   entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
   EXPECT_FALSE(controller.GetPendingEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should now have 2 subframe FrameNavigationEntries.
-    ASSERT_EQ(2U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[1]->frame_entry.get();
-    EXPECT_EQ(foo_url, frame_entry->url());
-    EXPECT_TRUE(root->child_at(1)->has_committed_real_load());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should now have 2 subframe FrameNavigationEntries.
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  frame_entry = entry->root_node()->children[1]->frame_entry.get();
+  EXPECT_EQ(foo_url, frame_entry->url());
+  EXPECT_TRUE(root->child_at(1)->has_committed_real_load());
 
   // 3. Create a nested iframe in the second subframe.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + foo_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root->child_at(1), script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // The last committed NavigationEntry shouldn't have changed.
   EXPECT_EQ(1, controller.GetEntryCount());
   entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should now have 2 subframe FrameNavigationEntries.
-    ASSERT_EQ(2U, entry->root_node()->children.size());
-    ASSERT_EQ(1U, entry->root_node()->children[1]->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[1]->children[0]->frame_entry.get();
-    EXPECT_EQ(foo_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should now have 2 subframe FrameNavigationEntries.
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  ASSERT_EQ(1U, entry->root_node()->children[1]->children.size());
+  frame_entry = entry->root_node()->children[1]->children[0]->frame_entry.get();
+  EXPECT_EQ(foo_url, frame_entry->url());
 
   // 4. Create a third iframe on the same site as the second.  This ensures that
   // the commit type is correct even when the subframe process already exists.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + foo_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // The last committed NavigationEntry shouldn't have changed.
   EXPECT_EQ(1, controller.GetEntryCount());
   entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should now have 3 subframe FrameNavigationEntries.
-    ASSERT_EQ(3U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[2]->frame_entry.get();
-    EXPECT_EQ(foo_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // The entry should now have 3 subframe FrameNavigationEntries.
+  ASSERT_EQ(3U, entry->root_node()->children.size());
+  frame_entry = entry->root_node()->children[2]->frame_entry.get();
+  EXPECT_EQ(foo_url, frame_entry->url());
 
   // 5. Create a nested iframe on the original site (A-B-A).
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + frame_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     FrameTreeNode* child = root->child_at(2);
     EXPECT_TRUE(ExecuteScript(child, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // The last committed NavigationEntry shouldn't have changed.
   EXPECT_EQ(1, controller.GetEntryCount());
   entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(main_url, entry->GetURL());
   root_entry = entry->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // There should be a corresponding FrameNavigationEntry.
-    ASSERT_EQ(1U, entry->root_node()->children[2]->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[2]->children[0]->frame_entry.get();
-    EXPECT_EQ(frame_url, frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  // There should be a corresponding FrameNavigationEntry.
+  ASSERT_EQ(1U, entry->root_node()->children[2]->children.size());
+  frame_entry = entry->root_node()->children[2]->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_url, frame_entry->url());
 
   // Check the end result of the frame tree.
   if (AreAllSitesIsolatedForTesting()) {
     FrameTreeVisualizer visualizer;
     EXPECT_EQ(
         " Site A ------------ proxies for B\n"
         "   |--Site A ------- proxies for B\n"
         "   |--Site B ------- proxies for A\n"
         "   |    +--Site B -- proxies for A\n"
         "   +--Site B ------- proxies for A\n"
@@ skipping 46 matching lines @@
 
   // We should have created a new NavigationEntry with the same main frame URL.
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
   EXPECT_NE(entry, entry2);
   EXPECT_EQ(main_url, entry2->GetURL());
   FrameNavigationEntry* root_entry2 = entry2->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry2->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a new FrameNavigationEntries for the subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a new FrameNavigationEntries for the subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
 
   // 3. Create a second, initially cross-site iframe.
   GURL foo_url(embedded_test_server()->GetURL(
       "foo.com", "/navigation_controller/simple_page_1.html"));
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + foo_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
@@ skipping 28 matching lines @@
 
   // We should have created a new NavigationEntry with the same main frame URL.
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry3 = controller.GetLastCommittedEntry();
   EXPECT_NE(entry, entry3);
   EXPECT_EQ(main_url, entry3->GetURL());
   FrameNavigationEntry* root_entry3 = entry3->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry3->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should still have FrameNavigationEntries for all 3 subframes.
-    ASSERT_EQ(2U, entry3->root_node()->children.size());
-    EXPECT_EQ(frame_url2, entry3->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(foo_url, entry3->root_node()->children[1]->frame_entry->url());
-    ASSERT_EQ(1U, entry3->root_node()->children[1]->children.size());
-    EXPECT_EQ(
-        bar_url,
-        entry3->root_node()->children[1]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
+  // The entry should still have FrameNavigationEntries for all 3 subframes.
+  ASSERT_EQ(2U, entry3->root_node()->children.size());
+  EXPECT_EQ(frame_url2, entry3->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(foo_url, entry3->root_node()->children[1]->frame_entry->url());
+  ASSERT_EQ(1U, entry3->root_node()->children[1]->children.size());
+  EXPECT_EQ(bar_url,
+            entry3->root_node()->children[1]->children[0]->frame_entry->url());
 
   // 6. Navigate the second subframe cross-site, clearing its existing subtree.
   GURL baz_url(embedded_test_server()->GetURL(
       "baz.com", "/navigation_controller/simple_page_1.html"));
   {
     FrameNavigateParamsCapturer capturer(root->child_at(1));
     RenderFrameDeletedObserver deleted_observer(
         root->child_at(1)->current_frame_host());
     std::string script = "var frames = document.getElementsByTagName('iframe');"
                          "frames[1].src = '" + baz_url.spec() + "';";
     EXPECT_TRUE(ExecuteScript(root, script));
     // Wait for the RenderFrame to go away, if this will be cross-process.
     if (AreAllSitesIsolatedForTesting())
       deleted_observer.WaitUntilDeleted();
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_MANUAL_SUBFRAME));
     EXPECT_EQ(NAVIGATION_TYPE_NEW_SUBFRAME, capturer.details().type);
   }
 
   // We should have created a new NavigationEntry with the same main frame URL.
   EXPECT_EQ(4, controller.GetEntryCount());
   EXPECT_EQ(3, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry4 = controller.GetLastCommittedEntry();
   EXPECT_NE(entry, entry4);
   EXPECT_EQ(main_url, entry4->GetURL());
   FrameNavigationEntry* root_entry4 = entry4->root_node()->frame_entry.get();
   EXPECT_EQ(main_url, root_entry4->url());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should still have FrameNavigationEntries for all 3 subframes.
-    ASSERT_EQ(2U, entry4->root_node()->children.size());
-    EXPECT_EQ(frame_url2, entry4->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(baz_url, entry4->root_node()->children[1]->frame_entry->url());
-    ASSERT_EQ(0U, entry4->root_node()->children[1]->children.size());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry4->root_node()->children.size());
-  }
+  // The entry should still have FrameNavigationEntries for all 3 subframes.
+  ASSERT_EQ(2U, entry4->root_node()->children.size());
+  EXPECT_EQ(frame_url2, entry4->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(baz_url, entry4->root_node()->children[1]->frame_entry->url());
+  ASSERT_EQ(0U, entry4->root_node()->children[1]->children.size());
 
   // Check the end result of the frame tree.
   if (AreAllSitesIsolatedForTesting()) {
     FrameTreeVisualizer visualizer;
     EXPECT_EQ(
         " Site A ------------ proxies for B\n"
         "   |--Site A ------- proxies for B\n"
         "   +--Site B ------- proxies for A\n"
         "Where A = http://127.0.0.1/\n"
         "      B = http://baz.com/",
@@ skipping 29 matching lines @@
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   // 2. In-page navigation in the main frame.
   std::string push_script = "history.pushState({}, 'page 2', 'page_2.html')";
   EXPECT_TRUE(ExecuteScript(root, push_script));
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
+  // The entry should have a FrameNavigationEntry for the subframe.
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(subframe_url,
-              entry->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(subframe_url, entry->root_node()->children[0]->frame_entry->url());
 
   // 3. Add a nested subframe.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + subframe_url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
+  // The entry should have a FrameNavigationEntry for the subframe.
   entry = controller.GetLastCommittedEntry();
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(subframe_url,
-              entry->root_node()->children[0]->frame_entry->url());
-    ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
-    EXPECT_EQ(subframe_url,
-              entry->root_node()->children[0]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry->root_node()->children.size());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(subframe_url, entry->root_node()->children[0]->frame_entry->url());
+  ASSERT_EQ(1U, entry->root_node()->children[0]->children.size());
+  EXPECT_EQ(subframe_url,
+            entry->root_node()->children[0]->children[0]->frame_entry->url());
 }
 
 // Verify the tree of FrameNavigationEntries after back/forward navigations in a
 // cross-site subframe.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_SubframeBackForward) {
   GURL main_url(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
   const NavigationControllerImpl& controller =
@@ skipping 46 matching lines @@
     shell()->web_contents()->GetController().GoBack();
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
     EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
   }
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry2, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
 
   // 5. Go back in the subframe again to the parent page's site.
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0));
     shell()->web_contents()->GetController().GoBack();
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
     EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
   }
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry1, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry1->root_node()->children.size());
-    EXPECT_EQ(frame_url, entry1->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry1->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the subframe.
+  ASSERT_EQ(1U, entry1->root_node()->children.size());
+  EXPECT_EQ(frame_url, entry1->root_node()->children[0]->frame_entry->url());
 
   // 6. Go forward in the subframe cross-site.
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0));
     shell()->web_contents()->GetController().GoForward();
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
     EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
   }
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry2, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(frame_url2, entry2->root_node()->children[0]->frame_entry->url());
 
   // 7. Go forward in the subframe again, cross-site.
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0));
     shell()->web_contents()->GetController().GoForward();
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_AUTO_SUBFRAME));
     EXPECT_EQ(NAVIGATION_TYPE_AUTO_SUBFRAME, capturer.details().type);
   }
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry3, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry3->root_node()->children.size());
-    EXPECT_EQ(frame_url3, entry3->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the subframe.
+  ASSERT_EQ(1U, entry3->root_node()->children.size());
+  EXPECT_EQ(frame_url3, entry3->root_node()->children[0]->frame_entry->url());
 }
 
 // Verify the tree of FrameNavigationEntries after subframes are recreated in
 // history navigations, including nested frames.  The history will look like:
 // 1. initial_url
 // 2. main_url_a (data_url)
 // 3. main_url_a (frame_url_b (data_url))
 // 4. main_url_a (frame_url_b (frame_url_c))
 // 5. main_url_d
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
@@ skipping 19 matching lines @@
   EXPECT_TRUE(NavigateToURL(shell(), main_url_a));
   ASSERT_EQ(1U, root->child_count());
   ASSERT_EQ(0U, root->child_at(0)->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the data subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(data_url, entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the data subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(data_url, entry2->root_node()->children[0]->frame_entry->url());
 
   // 3. Navigate the iframe cross-site to a page with a nested iframe.
   GURL frame_url_b(embedded_test_server()->GetURL(
       "b.com", "/navigation_controller/page_with_data_iframe.html"));
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0));
     NavigateFrameToURL(root->child_at(0), frame_url_b);
     capturer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry3 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the b.com subframe.
-    ASSERT_EQ(1U, entry3->root_node()->children.size());
-    ASSERT_EQ(1U, entry3->root_node()->children[0]->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry3->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(
-        data_url,
-        entry3->root_node()->children[0]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the b.com subframe.
+  ASSERT_EQ(1U, entry3->root_node()->children.size());
+  ASSERT_EQ(1U, entry3->root_node()->children[0]->children.size());
+  EXPECT_EQ(frame_url_b, entry3->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(data_url,
+            entry3->root_node()->children[0]->children[0]->frame_entry->url());
 
   // 4. Navigate the nested iframe cross-site.
   GURL frame_url_c(embedded_test_server()->GetURL(
       "c.com", "/navigation_controller/simple_page_2.html"));
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0)->child_at(0));
     NavigateFrameToURL(root->child_at(0)->child_at(0), frame_url_c);
     capturer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
   EXPECT_EQ(frame_url_c, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(4, controller.GetEntryCount());
   EXPECT_EQ(3, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry4 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have FrameNavigationEntries for the subframes.
-    ASSERT_EQ(1U, entry4->root_node()->children.size());
-    ASSERT_EQ(1U, entry4->root_node()->children[0]->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry4->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(
-        frame_url_c,
-        entry4->root_node()->children[0]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry4->root_node()->children.size());
-  }
+  // The entry should have FrameNavigationEntries for the subframes.
+  ASSERT_EQ(1U, entry4->root_node()->children.size());
+  ASSERT_EQ(1U, entry4->root_node()->children[0]->children.size());
+  EXPECT_EQ(frame_url_b, entry4->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(frame_url_c,
+            entry4->root_node()->children[0]->children[0]->frame_entry->url());
 
   // Remember the DSNs for later.
   int64_t root_dsn =
       entry4->root_node()->frame_entry->document_sequence_number();
-  int64_t frame_b_dsn = -1;
-  int64_t frame_c_dsn = -1;
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    frame_b_dsn = entry4->root_node()
-                      ->children[0]
-                      ->frame_entry->document_sequence_number();
-    frame_c_dsn = entry4->root_node()
-                      ->children[0]
-                      ->children[0]
-                      ->frame_entry->document_sequence_number();
-  }
+  int64_t frame_b_dsn =
+      entry4->root_node()->children[0]->frame_entry->document_sequence_number();
+  int64_t frame_c_dsn = entry4->root_node()
+                            ->children[0]
+                            ->children[0]
+                            ->frame_entry->document_sequence_number();
 
   // 5. Navigate main frame cross-site, destroying the frames.
   GURL main_url_d(embedded_test_server()->GetURL(
       "d.com", "/navigation_controller/simple_page_2.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_d));
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_d, root->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(4, controller.GetLastCommittedEntryIndex());
@@ skipping 13 matching lines @@
   EXPECT_EQ(frame_url_c, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(3, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry4, controller.GetLastCommittedEntry());
 
   // The main frame should not have changed its DSN.
   EXPECT_EQ(root_dsn,
             entry4->root_node()->frame_entry->document_sequence_number());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have FrameNavigationEntries for the subframes.
-    ASSERT_EQ(1U, entry4->root_node()->children.size());
-    ASSERT_EQ(1U, entry4->root_node()->children[0]->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry4->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(
-        frame_url_c,
-        entry4->root_node()->children[0]->children[0]->frame_entry->url());
-
-    // The subframes should not have changed their DSNs.
-    // See https://crbug.com/628286.
-    EXPECT_EQ(frame_b_dsn, entry4->root_node()
-                               ->children[0]
-                               ->frame_entry->document_sequence_number());
-    EXPECT_EQ(frame_c_dsn, entry4->root_node()
-                               ->children[0]
-                               ->children[0]
-                               ->frame_entry->document_sequence_number());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry4->root_node()->children.size());
-  }
+  // The entry should have FrameNavigationEntries for the subframes.
+  ASSERT_EQ(1U, entry4->root_node()->children.size());
+  ASSERT_EQ(1U, entry4->root_node()->children[0]->children.size());
+  EXPECT_EQ(frame_url_b, entry4->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(frame_url_c,
+            entry4->root_node()->children[0]->children[0]->frame_entry->url());
+  // The subframes should not have changed their DSNs.
+  // See https://crbug.com/628286.
+  EXPECT_EQ(frame_b_dsn, entry4->root_node()
+                             ->children[0]
+                             ->frame_entry->document_sequence_number());
+  EXPECT_EQ(frame_c_dsn, entry4->root_node()
+                             ->children[0]
+                             ->children[0]
+                             ->frame_entry->document_sequence_number());
 
   // Inject a JS value so that we can check for it later.
   EXPECT_TRUE(content::ExecuteScript(root, "foo=3;"));
 
   // 7. Go back again, to the data URL in the nested iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   ASSERT_EQ(1U, root->child_at(0)->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry3, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have FrameNavigationEntries for the subframes.
-    ASSERT_EQ(1U, entry3->root_node()->children.size());
-    ASSERT_EQ(1U, entry3->root_node()->children[0]->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry3->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(
-        data_url,
-        entry3->root_node()->children[0]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
+  // The entry should have FrameNavigationEntries for the subframes.
+  ASSERT_EQ(1U, entry3->root_node()->children.size());
+  ASSERT_EQ(1U, entry3->root_node()->children[0]->children.size());
+  EXPECT_EQ(frame_url_b, entry3->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(data_url,
+            entry3->root_node()->children[0]->children[0]->frame_entry->url());
 
   // Verify that we did not reload the main frame. See https://crbug.com/586234.
   {
     int value = 0;
     EXPECT_TRUE(ExecuteScriptAndExtractInt(
         root, "domAutomationController.send(foo)", &value));
     EXPECT_EQ(3, value);
   }
 
   // 8. Go back again, to the data URL in the first subframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   ASSERT_EQ(0U, root->child_at(0)->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry2, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(data_url, entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(data_url, entry2->root_node()->children[0]->frame_entry->url());
 
   // 9. Go back again, to the initial main frame page.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(initial_url, root->current_url());
 
@@ skipping 10 matching lines @@
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(5, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry3, controller.GetLastCommittedEntry());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have FrameNavigationEntries for the subframes.
-    ASSERT_EQ(1U, entry3->root_node()->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry3->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(
-        data_url,
-        entry3->root_node()->children[0]->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry3->root_node()->children.size());
-  }
+  // The entry should have FrameNavigationEntries for the subframes.
+  ASSERT_EQ(1U, entry3->root_node()->children.size());
+  EXPECT_EQ(frame_url_b, entry3->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(data_url,
+            entry3->root_node()->children[0]->children[0]->frame_entry->url());
 }
 
 // Verify that we navigate to the fallback (original) URL if a subframe's
 // FrameNavigationEntry can't be found during a history navigation.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_SubframeHistoryFallback) {
-  // This test only makes sense when subframe FrameNavigationEntries are in use.
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   // 1. Start on a page with a data URL iframe.
   GURL main_url_a(embedded_test_server()->GetURL(
       "a.com", "/navigation_controller/page_with_data_iframe.html"));
   GURL data_url("data:text/html,Subframe");
   EXPECT_TRUE(NavigateToURL(shell(), main_url_a));
   const NavigationControllerImpl& controller =
       static_cast<const NavigationControllerImpl&>(
           shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
@@ skipping 88 matching lines @@
 
   // The MessageLoopRunner used to spin the message loop.
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
 };
 
 // Verify that dynamically generated iframes load properly during a history
 // navigation if no history item can be found for them.
 // See https://crbug.com/649345.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_DynamicSubframeHistoryFallback) {
-  // This test only makes sense when subframe FrameNavigationEntries are in use.
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   // 1. Start on a page with a script-generated iframe.  The iframe has a
   // dynamic name, starts at about:blank, and gets navigated to a dynamic data
   // URL as the page is loading.
   GURL main_url_a(embedded_test_server()->GetURL(
       "a.com", "/navigation_controller/dynamic_iframe.html"));
   {
     // Wait until the data URL has committed, even if load stop happens after
     // about:blank load.
     DataUrlCommitObserver data_observer(shell()->web_contents());
     EXPECT_TRUE(NavigateToURL(shell(), main_url_a));
@@ skipping 89 matching lines @@
         root->child_at(0),
         "domAutomationController.send(document.body.innerHTML)", &value));
     EXPECT_EQ(expected_text, value);
   }
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // The entry should have a FrameNavigationEntry for the blank subframe.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 
   // 2. Navigate the main frame, destroying the frames.
   GURL main_url_2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_2));
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_2, root->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
@@ skipping 15 matching lines @@
         root->child_at(0),
         "domAutomationController.send(document.body.innerHTML)", &value));
     EXPECT_EQ(expected_text, value);
   }
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
   // The entry should have a FrameNavigationEntry for the blank subframe.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 }
 
 // Verify that we correctly load nested iframes injected into a page if we go
 // back and recreate them.  Also confirm that form values are not restored for
 // forms injected into about:blank pages.  See https://crbug.com/657896.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_RecreatedInjectedBlankSubframe) {
   // 1. Start on a page that injects a nested iframe into an injected
   // about:blank iframe.
   GURL main_url(embedded_test_server()->GetURL(
@@ skipping 14 matching lines @@
   ASSERT_EQ(0U, root->child_at(0)->child_at(0)->child_count());
   EXPECT_EQ(main_url, root->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
   EXPECT_EQ(inner_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // The entry should have FrameNavigationEntries for the subframes.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(inner_url,
-              entry->root_node()->children[0]->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(inner_url,
+            entry->root_node()->children[0]->children[0]->frame_entry->url());
 
   // Set a value in the form which will be stored in the PageState.
   EXPECT_TRUE(
       ExecuteScript(root->child_at(0)->child_at(0),
                     "document.getElementById('itext').value = 'modified';"));
 
   // 2. Navigate the main frame same-site, destroying the subframes.
   GURL main_url_2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_2));
@@ skipping 14 matching lines @@
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
 
   // Verify that the inner iframe went to the correct URL.
   EXPECT_EQ(inner_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
   // The entry should have FrameNavigationEntries for the subframes.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(inner_url,
-              entry->root_node()->children[0]->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(inner_url,
+            entry->root_node()->children[0]->children[0]->frame_entry->url());
 
   // With injected about:blank iframes, we never restore form values from
   // PageState.
   std::string form_value = "fail";
   EXPECT_TRUE(
       ExecuteScriptAndExtractString(root->child_at(0)->child_at(0),
                                     "window.domAutomationController.send("
                                     "document.getElementById('itext').value);",
                                     &form_value));
   EXPECT_EQ("", form_value);
@@ skipping 29 matching lines @@
   ASSERT_EQ(0U, root->child_at(0)->child_at(0)->child_count());
   EXPECT_EQ(main_url, root->current_url());
   EXPECT_EQ(srcdoc_url, root->child_at(0)->current_url());
   EXPECT_EQ(inner_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // The entry should have FrameNavigationEntries for the subframes.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(srcdoc_url, entry->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(inner_url,
-              entry->root_node()->children[0]->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(srcdoc_url, entry->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(inner_url,
+            entry->root_node()->children[0]->children[0]->frame_entry->url());
 
   // Set a value in the form which will be stored in the PageState.
   EXPECT_TRUE(
       ExecuteScript(root->child_at(0)->child_at(0),
                     "document.getElementById('itext').value = 'modified';"));
 
   // 2. Navigate the main frame same-site, destroying the subframes.
   GURL main_url_2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_2));
@@ skipping 16 matching lines @@
   EXPECT_EQ(srcdoc_url, root->child_at(0)->current_url());
 
   // Verify that the inner iframe went to the correct URL.
   EXPECT_EQ(inner_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
   // The entry should have FrameNavigationEntries for the subframes.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(srcdoc_url, entry->root_node()->children[0]->frame_entry->url());
-    EXPECT_EQ(inner_url,
-              entry->root_node()->children[0]->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(srcdoc_url, entry->root_node()->children[0]->frame_entry->url());
+  EXPECT_EQ(inner_url,
+            entry->root_node()->children[0]->children[0]->frame_entry->url());
 
   // With injected iframe srcdoc pages, we do restore form values from
   // PageState.
   std::string form_value;
   EXPECT_TRUE(
       ExecuteScriptAndExtractString(root->child_at(0)->child_at(0),
                                     "window.domAutomationController.send("
                                     "document.getElementById('itext').value);",
                                     &form_value));
   EXPECT_EQ("modified", form_value);
@@ skipping 21 matching lines @@
 
   // 2. Navigate the subframe to about:blank.
   GURL blank_url(url::kAboutBlankURL);
   NavigateFrameToURL(root->child_at(0), blank_url);
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // The entry should have a FrameNavigationEntry for the blank subframe.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 
   // 3. Navigate the main frame, destroying the frames.
   GURL main_url_2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_2));
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_2, root->current_url());
 
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
 
   // 3. Go back, recreating the iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     controller.GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url, root->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
 
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
   // The entry should have a FrameNavigationEntry for the blank subframe.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 }
 
 // Ensure we don't crash if an onload handler removes an about:blank frame after
 // recreating it on a back/forward.  See https://crbug.com/638166.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_RemoveRecreatedBlankSubframe) {
   // 1. Start on a page that removes its about:blank iframe during onload.
   GURL main_url(embedded_test_server()->GetURL(
       "/navigation_controller/remove_blank_iframe_on_load.html"));
   GURL blank_url(url::kAboutBlankURL);
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
   NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
       shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   EXPECT_EQ(main_url, root->current_url());
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // The entry should have a FrameNavigationEntry for the blank subframe, even
   // though it is being removed from the page.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 
   // 2. Navigate the main frame, destroying the frames.
   GURL main_url_2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_2));
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_2, root->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
 
   // 3. Go back, recreating the iframe (and removing it again).
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     controller.GoBack();
     back_load_observer.Wait();
   }
   EXPECT_EQ(main_url, root->current_url());
 
   // Check that the renderer is still alive.
   EXPECT_TRUE(ExecuteScript(shell(), "console.log('Success');"));
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   EXPECT_EQ(entry, controller.GetLastCommittedEntry());
 
   // The entry should have a FrameNavigationEntry for the blank subframe.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
-  }
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, entry->root_node()->children[0]->frame_entry->url());
 }
 
 // Verifies that we clear the children FrameNavigationEntries if a history
 // navigation redirects, so that we don't try to load previous history items in
 // frames of the new page.  This should only clear the children of the frame
 // that is redirecting.  See https://crbug.com/585194.
 //
 // Specifically, this test covers the following interesting cases:
 // - Subframe redirect when going back from a different main frame (step 4).
 // - Subframe redirect without changing the main frame (step 6).
 // - Main frame redirect, clearing the children (step 8).
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_BackWithRedirect) {
   // 1. Start on a page with two frames.
   GURL initial_url(
       embedded_test_server()->GetURL("/frame_tree/page_with_two_frames.html"));
   EXPECT_TRUE(NavigateToURL(shell(), initial_url));
   const NavigationControllerImpl& controller =
       static_cast<const NavigationControllerImpl&>(
           shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(2U, root->child_count());
   NavigationEntryImpl* entry1 = controller.GetLastCommittedEntry();
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    EXPECT_EQ(2U, entry1->root_node()->children.size());
+  EXPECT_EQ(2U, entry1->root_node()->children.size());
 
   // 2. Navigate both iframes to a page with a nested iframe.
   GURL frame_url(embedded_test_server()->GetURL(
       "foo.com", "/navigation_controller/page_with_data_iframe.html"));
   GURL data_url("data:text/html,Subframe");
   NavigateFrameToURL(root->child_at(0), frame_url);
   NavigateFrameToURL(root->child_at(1), frame_url);
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(frame_url, root->child_at(0)->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->child_at(0)->current_url());
   EXPECT_EQ(frame_url, root->child_at(1)->current_url());
   EXPECT_EQ(data_url, root->child_at(1)->child_at(0)->current_url());
 
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    NavigationEntryImpl::TreeNode* root_node = entry2->root_node();
-    ASSERT_EQ(2U, root_node->children.size());
-    EXPECT_EQ(frame_url, root_node->children[0]->frame_entry->url());
-    EXPECT_EQ(data_url,
-              root_node->children[0]->children[0]->frame_entry->url());
-    EXPECT_EQ(frame_url, root_node->children[1]->frame_entry->url());
-    EXPECT_EQ(data_url,
-              root_node->children[1]->children[0]->frame_entry->url());
-  }
+
+  // Verify subframe entries.
+  NavigationEntryImpl::TreeNode* root_node = entry2->root_node();
+  ASSERT_EQ(2U, root_node->children.size());
+  EXPECT_EQ(frame_url, root_node->children[0]->frame_entry->url());
+  EXPECT_EQ(data_url, root_node->children[0]->children[0]->frame_entry->url());
+  EXPECT_EQ(frame_url, root_node->children[1]->frame_entry->url());
+  EXPECT_EQ(data_url, root_node->children[1]->children[0]->frame_entry->url());
 
   // Cause the first iframe to redirect when we come back later.  It will go
   // cross-site to a page with an about:blank iframe.
   GURL frame_redirect_dest_url(embedded_test_server()->GetURL(
       "bar.com", "/navigation_controller/page_with_iframe.html"));
   GURL blank_url(url::kAboutBlankURL);
   {
     TestNavigationObserver observer(shell()->web_contents());
     std::string script = "history.replaceState({}, '', '/server-redirect?" +
                          frame_redirect_dest_url.spec() + "')";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     observer.Wait();
   }
 
   // We should not have lost subframe entries for the nested frame.
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    FrameNavigationEntry* nested_entry =
-        entry2->GetFrameEntry(root->child_at(0)->child_at(0));
-    EXPECT_TRUE(nested_entry);
-    EXPECT_EQ(data_url, nested_entry->url());
-  }
+  FrameNavigationEntry* nested_entry =
+      entry2->GetFrameEntry(root->child_at(0)->child_at(0));
+  EXPECT_TRUE(nested_entry);
+  EXPECT_EQ(data_url, nested_entry->url());
 
   // 3. Navigate the main frame to a different page.  When we come back, we'll
   // commit the main frame first and have no pending entry when navigating the
   // subframes.
   GURL url2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url2));
   EXPECT_EQ(4, controller.GetEntryCount());
   EXPECT_EQ(3, controller.GetLastCommittedEntryIndex());
 
   // 4. Go back. The first iframe should redirect to a cross-site page with a
   // different nested iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     shell()->web_contents()->GetController().GoBack();
     back_load_observer.Wait();
   }
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(frame_redirect_dest_url, root->child_at(0)->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->child_at(0)->current_url());
   EXPECT_EQ(frame_url, root->child_at(1)->current_url());
   EXPECT_EQ(data_url, root->child_at(1)->child_at(0)->current_url());
 
   // Check the FrameNavigationEntries as well.
   EXPECT_EQ(4, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(frame_redirect_dest_url,
-              entry2->GetFrameEntry(root->child_at(0))->url());
-    EXPECT_EQ(blank_url,
-              entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
-    EXPECT_EQ(frame_url, entry2->GetFrameEntry(root->child_at(1))->url());
-    EXPECT_EQ(data_url,
-              entry2->GetFrameEntry(root->child_at(1)->child_at(0))->url());
-  }
+  EXPECT_EQ(frame_redirect_dest_url,
+            entry2->GetFrameEntry(root->child_at(0))->url());
+  EXPECT_EQ(blank_url,
+            entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
+  EXPECT_EQ(frame_url, entry2->GetFrameEntry(root->child_at(1))->url());
+  EXPECT_EQ(data_url,
+            entry2->GetFrameEntry(root->child_at(1)->child_at(0))->url());
 
   // In --site-per-process, we're misclassifying the subframe redirect in step 6
   // below.  For now, skip the rest of the test in that mode.
   // TODO(creis): Fix this in https://crbug.com/628782.
   if (AreAllSitesIsolatedForTesting())
     return;
 
   // Now cause the second iframe to redirect when we come back to it.
   {
     TestNavigationObserver observer(shell()->web_contents());
@@ skipping 23 matching lines @@
   }
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(frame_redirect_dest_url, root->child_at(0)->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->child_at(0)->current_url());
   EXPECT_EQ(frame_redirect_dest_url, root->child_at(1)->current_url());
   EXPECT_EQ(blank_url, root->child_at(1)->child_at(0)->current_url());
 
   // Check the FrameNavigationEntries as well.
   EXPECT_EQ(4, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(frame_redirect_dest_url,
-              entry2->GetFrameEntry(root->child_at(0))->url());
-    EXPECT_EQ(blank_url,
-              entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
-    EXPECT_EQ(frame_redirect_dest_url,
-              entry2->GetFrameEntry(root->child_at(1))->url());
-    EXPECT_EQ(blank_url,
-              entry2->GetFrameEntry(root->child_at(1)->child_at(0))->url());
-  }
+  EXPECT_EQ(frame_redirect_dest_url,
+            entry2->GetFrameEntry(root->child_at(0))->url());
+  EXPECT_EQ(blank_url,
+            entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
+  EXPECT_EQ(frame_redirect_dest_url,
+            entry2->GetFrameEntry(root->child_at(1))->url());
+  EXPECT_EQ(blank_url,
+            entry2->GetFrameEntry(root->child_at(1)->child_at(0))->url());
 
   // Now cause the main frame to redirect to a page with no frames when we come
   // back to it.
   GURL redirect_dest_url(embedded_test_server()->GetURL(
       "bar.com", "/navigation_controller/simple_page_2.html"));
   {
     TestNavigationObserver observer(shell()->web_contents());
     std::string script = "history.replaceState({}, '', '/server-redirect?" +
                          redirect_dest_url.spec() + "')";
     EXPECT_TRUE(ExecuteScript(root, script));
@@ skipping 28 matching lines @@
       "/navigation_controller/page_with_data_iframe.html"));
   EXPECT_TRUE(NavigateToURL(shell(), initial_url));
   NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
       shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(1U, root->child_count());
   NavigationEntryImpl* entry1 = controller.GetLastCommittedEntry();
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    EXPECT_EQ(1U, entry1->root_node()->children.size());
+  EXPECT_EQ(1U, entry1->root_node()->children.size());
 
   // 2. Navigate the iframe to a page with a nested iframe.
   GURL frame_url(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_data_iframe.html"));
   GURL data_url("data:text/html,Subframe");
   NavigateFrameToURL(root->child_at(0), frame_url);
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(frame_url, root->child_at(0)->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    NavigationEntryImpl::TreeNode* root_node = entry2->root_node();
-    ASSERT_EQ(1U, root_node->children.size());
-    EXPECT_EQ(frame_url, root_node->children[0]->frame_entry->url());
-    EXPECT_EQ(data_url,
-              root_node->children[0]->children[0]->frame_entry->url());
-  }
+
+  // Verify subframe entries.
+  NavigationEntryImpl::TreeNode* root_node = entry2->root_node();
+  ASSERT_EQ(1U, root_node->children.size());
+  EXPECT_EQ(frame_url, root_node->children[0]->frame_entry->url());
+  EXPECT_EQ(data_url, root_node->children[0]->children[0]->frame_entry->url());
 
   // Cause the iframe to redirect when we come back later.  It will go
   // same-origin to a page with an about:blank iframe.
   GURL frame_redirect_dest_url(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_iframe.html"));
   {
     TestNavigationObserver observer(shell()->web_contents());
     std::string script = "history.replaceState({}, '', '/server-redirect?" +
                          frame_redirect_dest_url.spec() + "')";
     EXPECT_TRUE(ExecuteScript(root->child_at(0), script));
     observer.Wait();
   }
 
   // We should not have lost subframe entries for the nested frame.
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    FrameNavigationEntry* nested_entry =
-        entry2->GetFrameEntry(root->child_at(0)->child_at(0));
-    EXPECT_TRUE(nested_entry);
-    EXPECT_EQ(data_url, nested_entry->url());
-  }
+  FrameNavigationEntry* nested_entry =
+      entry2->GetFrameEntry(root->child_at(0)->child_at(0));
+  EXPECT_TRUE(nested_entry);
+  EXPECT_EQ(data_url, nested_entry->url());
 
   // 3. Navigate the main frame to a different page.  When we come back, we'll
   // commit the main frame first and have no pending entry when navigating the
   // subframes.
   GURL url2(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url2));
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
 
   // 4. Go back. The first iframe should redirect to a same-origin page with a
   // different nested iframe.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     controller.GoBack();
     back_load_observer.Wait();
   }
   GURL blank_url(url::kAboutBlankURL);
   EXPECT_EQ(initial_url, root->current_url());
   EXPECT_EQ(frame_redirect_dest_url, root->child_at(0)->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->child_at(0)->current_url());
 
   // Check the FrameNavigationEntries as well.
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(frame_redirect_dest_url,
-              entry2->GetFrameEntry(root->child_at(0))->url());
-    EXPECT_EQ(blank_url,
-              entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
-  }
+  EXPECT_EQ(frame_redirect_dest_url,
+            entry2->GetFrameEntry(root->child_at(0))->url());
+  EXPECT_EQ(blank_url,
+            entry2->GetFrameEntry(root->child_at(0)->child_at(0))->url());
 
   // Now cause the main frame to redirect to a page with no frames when we come
   // back to it.
   GURL redirect_dest_url(embedded_test_server()->GetURL(
       "/navigation_controller/simple_page_2.html"));
   {
     TestNavigationObserver observer(shell()->web_contents());
     std::string script = "history.replaceState({}, '', '/server-redirect?" +
                          redirect_dest_url.spec() + "')";
     EXPECT_TRUE(ExecuteScript(root, script));
@@ skipping 36 matching lines @@
                             ->root();
   ASSERT_EQ(1U, root->child_count());
   ASSERT_EQ(0U, root->child_at(0)->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(data_url, root->child_at(0)->current_url());
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry1 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the data subframe.
-    ASSERT_EQ(1U, entry1->root_node()->children.size());
-    EXPECT_EQ(data_url, entry1->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry1->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the data subframe.
+  ASSERT_EQ(1U, entry1->root_node()->children.size());
+  EXPECT_EQ(data_url, entry1->root_node()->children[0]->frame_entry->url());
 
   // 2. Navigate the iframe cross-site.
   GURL frame_url_b(embedded_test_server()->GetURL(
       "b.com", "/navigation_controller/simple_page_1.html"));
   {
     FrameNavigateParamsCapturer capturer(root->child_at(0));
     NavigateFrameToURL(root->child_at(0), frame_url_b);
     capturer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url_a, root->current_url());
   EXPECT_EQ(frame_url_b, root->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry2 = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the b.com subframe.
-    ASSERT_EQ(1U, entry2->root_node()->children.size());
-    EXPECT_EQ(frame_url_b,
-              entry2->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, entry2->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the b.com subframe.
+  ASSERT_EQ(1U, entry2->root_node()->children.size());
+  EXPECT_EQ(frame_url_b, entry2->root_node()->children[0]->frame_entry->url());
 
   // 3. Navigate main frame cross-site, destroying the frames.
   GURL main_url_c(embedded_test_server()->GetURL(
       "c.com", "/navigation_controller/simple_page_2.html"));
   EXPECT_TRUE(NavigateToURL(shell(), main_url_c));
   ASSERT_EQ(0U, root->child_count());
   EXPECT_EQ(main_url_c, root->current_url());
 
   EXPECT_EQ(3, controller.GetEntryCount());
   EXPECT_EQ(2, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* entry3 = controller.GetLastCommittedEntry();
   EXPECT_EQ(0U, entry3->root_node()->children.size());
 
   // 4. Create a NavigationEntry with the same PageState as |entry2| and verify
   // it has the same FrameNavigationEntry structure.
   std::unique_ptr<NavigationEntryImpl> restored_entry =
       NavigationEntryImpl::FromNavigationEntry(
           NavigationControllerImpl::CreateNavigationEntry(
               main_url_a, Referrer(), ui::PAGE_TRANSITION_RELOAD, false,
               std::string(), controller.GetBrowserContext()));
   EXPECT_EQ(0U, restored_entry->root_node()->children.size());
   restored_entry->SetPageState(entry2->GetPageState());
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the b.com subframe.
-    EXPECT_EQ(main_url_a, restored_entry->root_node()->frame_entry->url());
-    ASSERT_EQ(1U, restored_entry->root_node()->children.size());
-    EXPECT_EQ(frame_url_b,
-              restored_entry->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, restored_entry->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the b.com subframe.
+  EXPECT_EQ(main_url_a, restored_entry->root_node()->frame_entry->url());
+  ASSERT_EQ(1U, restored_entry->root_node()->children.size());
+  EXPECT_EQ(frame_url_b,
+            restored_entry->root_node()->children[0]->frame_entry->url());
 
   // 5. Restore the new entry in a new tab and verify the correct URLs load.
   std::vector<std::unique_ptr<NavigationEntry>> entries;
   entries.push_back(std::move(restored_entry));
   Shell* new_shell = Shell::CreateNewWindow(
       controller.GetBrowserContext(), GURL::EmptyGURL(), nullptr, gfx::Size());
   FrameTreeNode* new_root =
       static_cast<WebContentsImpl*>(new_shell->web_contents())
           ->GetFrameTree()
           ->root();
   NavigationControllerImpl& new_controller =
       static_cast<NavigationControllerImpl&>(
           new_shell->web_contents()->GetController());
   new_controller.Restore(entries.size() - 1,
                          RestoreType::LAST_SESSION_EXITED_CLEANLY, &entries);
   ASSERT_EQ(0u, entries.size());
   {
     TestNavigationObserver restore_observer(new_shell->web_contents());
     new_controller.LoadIfNecessary();
     restore_observer.Wait();
   }
   ASSERT_EQ(1U, new_root->child_count());
   EXPECT_EQ(main_url_a, new_root->current_url());
   EXPECT_EQ(frame_url_b, new_root->child_at(0)->current_url());
 
   EXPECT_EQ(1, new_controller.GetEntryCount());
   EXPECT_EQ(0, new_controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* new_entry = new_controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the b.com subframe.
-    EXPECT_EQ(main_url_a, new_entry->root_node()->frame_entry->url());
-    ASSERT_EQ(1U, new_entry->root_node()->children.size());
-    EXPECT_EQ(frame_url_b,
-              new_entry->root_node()->children[0]->frame_entry->url());
-  } else {
-    // There are no subframe FrameNavigationEntries by default.
-    EXPECT_EQ(0U, new_entry->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the b.com subframe.
+  EXPECT_EQ(main_url_a, new_entry->root_node()->frame_entry->url());
+  ASSERT_EQ(1U, new_entry->root_node()->children.size());
+  EXPECT_EQ(frame_url_b,
+            new_entry->root_node()->children[0]->frame_entry->url());
 }
 
 // Verify that we can finish loading a page on restore if the PageState is
 // missing subframes.  See https://crbug.com/638088.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_RestoreViaPartialPageState) {
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/navigation_controller/inject_into_blank_iframe.html"));
   GURL blank_url(url::kAboutBlankURL);
   NavigationControllerImpl& controller =
@@ skipping 31 matching lines @@
     restore_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
   EXPECT_EQ(main_url, root->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
 
   EXPECT_EQ(1, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
   NavigationEntryImpl* new_entry = controller.GetLastCommittedEntry();
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // The entry should have a FrameNavigationEntry for the blank subframe.
-    EXPECT_EQ(main_url, new_entry->root_node()->frame_entry->url());
-    ASSERT_EQ(1U, new_entry->root_node()->children.size());
-    EXPECT_EQ(blank_url,
-              new_entry->root_node()->children[0]->frame_entry->url());
-  } else {
-    EXPECT_EQ(0U, new_entry->root_node()->children.size());
-  }
+  // The entry should have a FrameNavigationEntry for the blank subframe.
+  EXPECT_EQ(main_url, new_entry->root_node()->frame_entry->url());
+  ASSERT_EQ(1U, new_entry->root_node()->children.size());
+  EXPECT_EQ(blank_url, new_entry->root_node()->children[0]->frame_entry->url());
 
   // Verify that the parent was able to script the iframe.
   std::string expected_text("Injected text");
   {
     std::string value;
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         root->child_at(0),
         "domAutomationController.send(document.body.innerHTML)", &value));
     EXPECT_EQ(expected_text, value);
   }
@@ skipping 16 matching lines @@
                             ->GetFrameTree()
                             ->root();
   SiteInstance* main_site_instance =
       root->current_frame_host()->GetSiteInstance();
 
   // The main frame defaults to an empty name.
   FrameNavigationEntry* frame_entry =
       controller.GetLastCommittedEntry()->GetFrameEntry(root);
   EXPECT_EQ("", frame_entry->frame_unique_name());
 
-  // Test subframe unique names only if enabled, e.g. in --site-per-process.
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   // 2. Add an unnamed subframe, which does an AUTO_SUBFRAME navigation.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string script = "var iframe = document.createElement('iframe');"
                          "iframe.src = '" + url.spec() + "';"
                          "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
@@ skipping 219 matching lines @@
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
   }
 
   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());
-  }
+  FrameNavigationEntry* subframe_entry =
+      controller.GetLastCommittedEntry()->GetFrameEntry(subframe);
+  EXPECT_EQ(frame_url, subframe_entry->url());
 
   // 3. Reload the main frame.
   {
     FrameNavigateParamsCapturer capturer(root);
     controller.Reload(ReloadType::NORMAL, false);
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.params().transition, ui::PAGE_TRANSITION_RELOAD));
     EXPECT_EQ(NAVIGATION_TYPE_EXISTING_PAGE, capturer.details().type);
     EXPECT_FALSE(capturer.details().is_in_page);
@@ skipping 41 matching lines @@
   EXPECT_TRUE(ExecuteScript(root, script));
   EXPECT_TRUE(WaitForLoadStop(shell()->web_contents()));
 
   frame_entry = controller.GetLastCommittedEntry()->GetFrameEntry(root);
   int64_t isn_2 = frame_entry->item_sequence_number();
   int64_t dsn_2 = frame_entry->document_sequence_number();
   EXPECT_NE(-1, isn_2);
   EXPECT_NE(isn_1, isn_2);
   EXPECT_EQ(dsn_1, dsn_2);
 
-  // Test subframe sequence numbers only if enabled, e.g. in --site-per-process.
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   // 3. Add a subframe, which does an AUTO_SUBFRAME navigation.
   {
     LoadCommittedCapturer capturer(shell()->web_contents());
     std::string add_script = "var iframe = document.createElement('iframe');"
                              "iframe.src = '" + url.spec() + "';"
                              "document.body.appendChild(iframe);";
     EXPECT_TRUE(ExecuteScript(root, add_script));
     capturer.Wait();
     EXPECT_TRUE(ui::PageTransitionTypeIncludingQualifiersIs(
         capturer.transition_type(), ui::PAGE_TRANSITION_AUTO_SUBFRAME));
@@ skipping 66 matching lines @@
 
   // Navigate to a page with an redirecting iframe.
   EXPECT_TRUE(NavigateToURL(shell(), main_url));
 
   // Check that the main frame redirect chain contains only one url.
   EXPECT_EQ(1, controller.GetEntryCount());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(entry->GetRedirectChain().size(), 1u);
   EXPECT_EQ(entry->GetRedirectChain()[0], main_url);
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // Check that the FrameNavigationEntry's redirect chain contains 2 urls.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->frame_entry.get();
-    EXPECT_EQ(frame_entry->redirect_chain().size(), 2u);
-    EXPECT_EQ(frame_entry->redirect_chain()[0], iframe_redirect_url);
-    EXPECT_EQ(frame_entry->redirect_chain()[1], iframe_final_url);
-  }
+  // Check that the FrameNavigationEntry's redirect chain contains 2 urls.
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_entry->redirect_chain().size(), 2u);
+  EXPECT_EQ(frame_entry->redirect_chain()[0], iframe_redirect_url);
+  EXPECT_EQ(frame_entry->redirect_chain()[1], iframe_final_url);
 }
 
 // Verifies that FrameNavigationEntry's redirect chain is created and stored on
 // the right subframe (NEW_SUBFRAME navigation).
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        FrameNavigationEntry_NewSubFrameRedirectChain) {
   const NavigationControllerImpl& controller =
       static_cast<const NavigationControllerImpl&>(
           shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
@@ skipping 11 matching lines @@
   GURL frame_redirect_url(
       embedded_test_server()->GetURL("/server-redirect?/simple_page.html"));
   NavigateFrameToURL(root->child_at(0), frame_redirect_url);
 
   // Check that the main frame redirect chain contains only the main_url.
   EXPECT_EQ(2, controller.GetEntryCount());
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
   EXPECT_EQ(entry->GetRedirectChain().size(), 1u);
   EXPECT_EQ(entry->GetRedirectChain()[0], main_url);
 
-  // Verify subframe entries if they're enabled (e.g. in --site-per-process).
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    // Check that the FrameNavigationEntry's redirect chain contains 2 urls.
-    ASSERT_EQ(1U, entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        entry->root_node()->children[0]->frame_entry.get();
-    EXPECT_EQ(frame_entry->redirect_chain().size(), 2u);
-    EXPECT_EQ(frame_entry->redirect_chain()[0], frame_redirect_url);
-    EXPECT_EQ(frame_entry->redirect_chain()[1], frame_final_url);
-  }
+  // Check that the FrameNavigationEntry's redirect chain contains 2 urls.
+  ASSERT_EQ(1U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ(frame_entry->redirect_chain().size(), 2u);
+  EXPECT_EQ(frame_entry->redirect_chain()[0], frame_redirect_url);
+  EXPECT_EQ(frame_entry->redirect_chain()[1], frame_final_url);
 }
 
 // Support a set of tests that isolate only a subset of sites with
 // out-of-process iframes (OOPIFs).
 class NavigationControllerOopifBrowserTest
     : public NavigationControllerBrowserTest {
  public:
   NavigationControllerOopifBrowserTest() {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ skipping 721 matching lines @@
   EXPECT_TRUE(root->current_frame_host()->IsRenderFrameLive());
 
   // TODO(creis): We should probably go back to frame_url here instead of the
   // initial blank page.  That might require updating all relevant NavEntries to
   // know what the first committed URL is, so that we really elide the initial
   // blank page from history.
   //
   // TODO(creis): This actually goes to frame_url in some cases when subframe
   // FrameNavigationEntries are enabled, due to a mismatch between PageState and
   // the entry's URL.  That should be fixed in https://crbug.com/617239.
   if (!SiteIsolationPolicy::UseSubframeNavigationEntries())

[Charlie Reis, 2017/01/04 18:42:09]

I left 3 of these in place, since they require a bit more thought.  I'll
update/remove them in a separate CL.

     EXPECT_EQ(blank_url, frame->current_url());
 }
 
 // This test is similar to "BackToAboutBlankIframe" above, except that a
 // fragment navigation is used rather than pushState (both create an in-page
 // navigation, so we need to test both), and an initial 'src' is given to the
 // iframe to test proper restoration in that case.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        BackToIframeWithContent) {
   GURL links_url(embedded_test_server()->GetURL(
@@ skipping 779 matching lines @@
                                           ->current_frame_host()
                                           ->GetSiteInstance()
                                           ->GetSiteURL());
   }
 }
 
 // Tests that when using FrameNavigationEntries, knowledge of POST navigations
 // is recorded on a subframe level.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        PostInSubframe) {
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
-    return;
-
   GURL page_with_form_url = embedded_test_server()->GetURL(
       "/navigation_controller/subframe_form.html");
   EXPECT_TRUE(NavigateToURL(shell(), page_with_form_url));
 
   NavigationControllerImpl& controller = static_cast<NavigationControllerImpl&>(
       shell()->web_contents()->GetController());
   FrameTreeNode* root = static_cast<WebContentsImpl*>(shell()->web_contents())
                             ->GetFrameTree()
                             ->root();
   FrameTreeNode* frame = root->child_at(0);
@@ skipping 92 matching lines @@
   EXPECT_EQ(2U, root->child_at(0)->child_count());
 
   NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
 
   // Verify only the parts of the NavigationEntry affected by this test.
   {
     // * Main frame has 3 subframes.
     FrameNavigationEntry* root_entry = entry->GetFrameEntry(root);
     EXPECT_NE(nullptr, root_entry);
     EXPECT_EQ("", root_entry->frame_unique_name());
-    if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-      EXPECT_EQ(3U, entry->root_node()->children.size());
+    EXPECT_EQ(3U, entry->root_node()->children.size());
 
-      // * The first child of the main frame is named and has two more children.
-      FrameTreeNode* frame = root->child_at(0);
-      FrameNavigationEntry* frame_entry = entry->GetFrameEntry(frame);
-      EXPECT_NE(nullptr, frame_entry);
-      EXPECT_EQ("1-1-name", frame_entry->frame_unique_name());
-      EXPECT_EQ(2U, entry->root_node()->children[0]->children.size());
-    }
+    // * The first child of the main frame is named and has two more children.
+    FrameTreeNode* frame = root->child_at(0);
+    FrameNavigationEntry* frame_entry = entry->GetFrameEntry(frame);
+    EXPECT_NE(nullptr, frame_entry);
+    EXPECT_EQ("1-1-name", frame_entry->frame_unique_name());
+    EXPECT_EQ(2U, entry->root_node()->children[0]->children.size());
   }
 
   // Removing the first child of the main frame should remove the corresponding
   // FrameTreeNode.
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(2U, root->child_count());
 
   // However, the FrameNavigationEntry objects for the frame that was removed
   // should still be around.
   {
     FrameNavigationEntry* root_entry = entry->GetFrameEntry(root);
     EXPECT_NE(nullptr, root_entry);
-    if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-      EXPECT_EQ(3U, entry->root_node()->children.size());
-      EXPECT_EQ(2U, entry->root_node()->children[0]->children.size());
-    }
+    EXPECT_EQ(3U, entry->root_node()->children.size());
+    EXPECT_EQ(2U, entry->root_node()->children[0]->children.size());
   }
 
   // Now, insert a frame with the same name as the previously removed one
   // at a different layer of the frame tree.
   FrameTreeNode* subframe = root->child_at(1)->child_at(1)->child_at(0);
   EXPECT_EQ(2U, root->child_at(1)->child_count());
   EXPECT_EQ(0U, subframe->child_count());
   std::string add_matching_name_frame_script =
       "var f = document.createElement('iframe');"
       "f.name = '1-1-name';"
       "document.body.appendChild(f);";
   EXPECT_TRUE(ExecuteScript(subframe, add_matching_name_frame_script));
   EXPECT_EQ(1U, subframe->child_count());
 
   // Verify that the FrameNavigationEntry for the original frame is now gone.
   {
     FrameNavigationEntry* root_entry = entry->GetFrameEntry(root);
     EXPECT_NE(nullptr, root_entry);
-    if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-      EXPECT_EQ(2U, entry->root_node()->children.size());
-    }
+    EXPECT_EQ(2U, entry->root_node()->children.size());
   }
 }
 
 // Tests that sending a PageState update from a named subframe does not get
 // incorrectly set on previously existing FrameNavigationEntry for the same
 // name. It is similar to EnsureFrameNavigationEntriesClearedOnMismatch, but
 // doesn't navigate the iframes to real URLs when added to the DOM.
 // See https://crbug.com/628677.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        EnsureFrameNavigationEntriesClearedOnMismatchNoSrc) {
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = web_contents->GetFrameTree()->root();
 
   GURL start_url(embedded_test_server()->GetURL("/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), start_url));
   NavigationEntryImpl* nav_entry =
       web_contents->GetController().GetLastCommittedEntry();
 
   EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
   EXPECT_EQ(1U, root->child_count());
   EXPECT_EQ("foo-frame-name", root->child_at(0)->frame_name());
 
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_count());
 
   // When a frame is removed from the page, the corresponding
   // FrameNavigationEntry is not removed. This is done intentionally to support
   // back-forward navigations in subframes and more intuitive UX on tab restore.
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(1U, nav_entry->root_node()->children.size());
-    FrameNavigationEntry* frame_entry =
-        nav_entry->root_node()->children[0]->frame_entry.get();
-    EXPECT_EQ("foo-frame-name", frame_entry->frame_unique_name());
-  }
+  EXPECT_EQ(1U, nav_entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry =
+      nav_entry->root_node()->children[0]->frame_entry.get();
+  EXPECT_EQ("foo-frame-name", frame_entry->frame_unique_name());
 
   EXPECT_TRUE(ExecuteScript(root, kAddFrameScript));
   EXPECT_EQ(1U, root->child_count());
   EXPECT_NE("foo-frame-name", root->child_at(0)->frame_name());
 
   // Add a nested frame with the previously used name.
   EXPECT_TRUE(ExecuteScript(root->child_at(0), kAddNamedFrameScript));
   EXPECT_EQ(1U, root->child_at(0)->child_count());
   EXPECT_EQ("foo-frame-name", root->child_at(0)->child_at(0)->frame_name());
 
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(1U, nav_entry->root_node()->children.size());
+  EXPECT_EQ(1U, nav_entry->root_node()->children.size());
 
-    NavigationEntryImpl::TreeNode* tree_node =
-        nav_entry->root_node()->children[0];
-    EXPECT_EQ(1U, tree_node->children.size());
+  NavigationEntryImpl::TreeNode* tree_node =
+      nav_entry->root_node()->children[0];
+  EXPECT_EQ(1U, tree_node->children.size());
 
-    tree_node = tree_node->children[0];
-    EXPECT_EQ(0U, tree_node->children.size());
-    EXPECT_EQ("foo-frame-name", tree_node->frame_entry->frame_unique_name());
-  }
+  tree_node = tree_node->children[0];
+  EXPECT_EQ(0U, tree_node->children.size());
+  EXPECT_EQ("foo-frame-name", tree_node->frame_entry->frame_unique_name());
 
   EXPECT_TRUE(ExecuteScript(root->child_at(0), kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_at(0)->child_count());
 }
 
 // This test ensures that the comparison of tree position between a
 // FrameTreeNode and FrameNavigationEntry works correctly for matching
 // first-level frames.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
                        EnsureFirstLevelFrameNavigationEntriesMatch) {
   WebContentsImpl* web_contents =
       static_cast<WebContentsImpl*>(shell()->web_contents());
   FrameTreeNode* root = web_contents->GetFrameTree()->root();
   NavigationEntryImpl::TreeNode* tree_node = nullptr;
 
   GURL start_url(embedded_test_server()->GetURL("/title1.html"));
   EXPECT_TRUE(NavigateToURL(shell(), start_url));
   NavigationEntryImpl* nav_entry =
       web_contents->GetController().GetLastCommittedEntry();
 
   // Add, then remove a named frame. It will create a FrameNavigationEntry
   // for the name and leave it around.
   EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
   EXPECT_EQ(1U, root->child_count());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(1U, nav_entry->root_node()->children.size());
-    tree_node = nav_entry->root_node()->children[0];
-  }
+  EXPECT_EQ(1U, nav_entry->root_node()->children.size());
+  tree_node = nav_entry->root_node()->children[0];
 
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_count());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries())
-    EXPECT_EQ(1U, nav_entry->root_node()->children.size());
+  EXPECT_EQ(1U, nav_entry->root_node()->children.size());
 
   // Add another frame with the same name as before. The matching logic
   // should consider them the same and result in the FrameNavigationEntry
   // being reused.
   EXPECT_TRUE(ExecuteScript(root, kAddNamedFrameScript));
   EXPECT_EQ(1U, root->child_count());
-  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    EXPECT_EQ(1U, nav_entry->root_node()->children.size());
-    EXPECT_EQ(tree_node, nav_entry->root_node()->children[0]);
-  }
+  EXPECT_EQ(1U, nav_entry->root_node()->children.size());
+  EXPECT_EQ(tree_node, nav_entry->root_node()->children[0]);
 
   EXPECT_TRUE(ExecuteScript(root, kRemoveFrameScript));
   EXPECT_EQ(0U, root->child_count());
 }
 
 // Test that navigations classified as SAME_PAGE properly update all the
 // members of FrameNavigationEntry. If not, it is possible to get a mismatch
 // between the origin and URL of a document as seen in
 // https://crbug.com/630103.
 IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
@@ skipping 427 matching lines @@
 
   controller.Reload(ReloadType::NORMAL, 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());
 
   GURL url_simple(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_iframe_simple.html"));
   GURL url_redirect(embedded_test_server()->GetURL(
       "/navigation_controller/page_with_iframe_redirect.html"));
 
   // Run this test twice: with and without a redirection.
@@ skipping 241 matching lines @@
   NavigationHandleCommitObserver handle_observer(shell()->web_contents(),
                                                  kFragmentURL);
   EXPECT_TRUE(NavigateToURL(shell(), kFragmentURL));
 
   EXPECT_TRUE(handle_observer.has_committed());
   EXPECT_TRUE(handle_observer.was_same_page());
   EXPECT_FALSE(handle_observer.was_renderer_initiated());
 }
 
 }  // namespace content