OOPIF: Support session restore by combining/splitting frame states.

content/browser/frame_host/frame_navigation_entry.cc

Index: content/browser/frame_host/frame_navigation_entry.cc
diff --git a/content/browser/frame_host/frame_navigation_entry.cc b/content/browser/frame_host/frame_navigation_entry.cc
index 74d9a397b05002ebd60e2134a9a2a2e692443520..8247514d450beac0c8f65f53625c227fbd0459f8 100644
--- a/content/browser/frame_host/frame_navigation_entry.cc
+++ b/content/browser/frame_host/frame_navigation_entry.cc
@@ -35,7 +35,7 @@ FrameNavigationEntry* FrameNavigationEntry::Clone() const {
   FrameNavigationEntry* copy = new FrameNavigationEntry(frame_tree_node_id_);
   copy->UpdateEntry(frame_unique_name_, item_sequence_number_,
                     document_sequence_number_, site_instance_.get(), url_,
-                    referrer_, page_state_);
+                    referrer_, frame_state_);
   return copy;
 }
 
@@ -45,14 +45,14 @@ void FrameNavigationEntry::UpdateEntry(const std::string& frame_unique_name,
                                        SiteInstanceImpl* site_instance,
                                        const GURL& url,
                                        const Referrer& referrer,
-                                       const PageState& page_state) {
+                                       const ExplodedFrameState& frame_state) {
   frame_unique_name_ = frame_unique_name;
   item_sequence_number_ = item_sequence_number;
   document_sequence_number_ = document_sequence_number;
   site_instance_ = site_instance;
   url_ = url;
   referrer_ = referrer;
-  page_state_ = page_state;
+  frame_state_ = frame_state;
 }
 
 void FrameNavigationEntry::set_item_sequence_number(