Remove old session history logic.

content/browser/frame_host/navigation_entry_impl.cc

 // Copyright 2013 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_entry_impl.h"
 
 #include <stddef.h>
 
 #include <queue>
 #include <utility>
@@ skipping 337 matching lines @@
 void NavigationEntryImpl::SetTitle(const base::string16& title) {
   title_ = title;
   cached_display_title_.clear();
 }
 
 const base::string16& NavigationEntryImpl::GetTitle() const {
   return title_;
 }
 
 void NavigationEntryImpl::SetPageState(const PageState& state) {
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) {
-    frame_tree_->frame_entry->SetPageState(state);
-    return;
-  }
-
   // SetPageState should only be called before the NavigationEntry has been
   // loaded, such as for restore (when there are no subframe
   // FrameNavigationEntries yet).  However, some callers expect to call this
   // after a Clone but before loading the page.  Clone will copy over the
   // subframe entries, and we should reset them before setting the state again.
   //
   // TODO(creis): It would be good to verify that this NavigationEntry hasn't
   // been loaded yet in cases that SetPageState is called while subframe
   // entries exist, but there's currently no way to check that.
   if (!frame_tree_->children.empty())
     frame_tree_->children.clear();
 
   // If the PageState can't be parsed or has no children, just store it on the
   // main frame's FrameNavigationEntry without recursively creating subframe
   // entries.
   ExplodedPageState exploded_state;
   if (!DecodePageState(state.ToEncodedData(), &exploded_state) ||
       exploded_state.top.children.size() == 0U) {
     frame_tree_->frame_entry->SetPageState(state);
     return;
   }
 
   RecursivelyGenerateFrameEntries(
       exploded_state.top, exploded_state.referenced_files, frame_tree_.get());
 }
 
 PageState NavigationEntryImpl::GetPageState() const {
-  // Just return the main frame's PageState in default Chrome, or if there are
-  // no subframe FrameNavigationEntries.
-  if (!SiteIsolationPolicy::UseSubframeNavigationEntries() ||
-      frame_tree_->children.size() == 0U)
+  // Just return the main frame's state if there are no subframe
+  // FrameNavigationEntries.
+  if (frame_tree_->children.size() == 0U)
     return frame_tree_->frame_entry->page_state();
 
   // When we're using subframe entries, each FrameNavigationEntry has a
   // frame-specific PageState.  We combine these into an ExplodedPageState tree
   // and generate a full PageState from it.
   ExplodedPageState exploded_state;
   RecursivelyGenerateFrameState(frame_tree_.get(), &exploded_state.top,
                                 &exploded_state.referenced_files);
 
   std::string encoded_data;
@@ skipping 553 matching lines @@
       return node;
 
     // Enqueue any children and keep looking.
     for (auto* child : node->children)
       work_queue.push(child);
   }
   return nullptr;
 }
 
 }  // namespace content