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

content/browser/frame_host/frame_navigation_entry.h

Index: content/browser/frame_host/frame_navigation_entry.h
diff --git a/content/browser/frame_host/frame_navigation_entry.h b/content/browser/frame_host/frame_navigation_entry.h
index b9734cb66deb08725c01d0832fc4a48607e15d10..55ef288764afae210f312d3c2c7b6fcbd908b4c1 100644
--- a/content/browser/frame_host/frame_navigation_entry.h
+++ b/content/browser/frame_host/frame_navigation_entry.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/site_instance_impl.h"
+#include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 
@@ -46,7 +47,7 @@ class CONTENT_EXPORT FrameNavigationEntry
                    SiteInstanceImpl* site_instance,
                    const GURL& url,
                    const Referrer& referrer,
-                   const PageState& page_state);
+                   const ExplodedFrameState& page_state);
 
   // The ID of the FrameTreeNode this entry is for.  -1 for the main frame,
   // since we don't always know the FrameTreeNode ID when creating the overall
@@ -100,8 +101,10 @@ class CONTENT_EXPORT FrameNavigationEntry
   void set_referrer(const Referrer& referrer) { referrer_ = referrer; }
   const Referrer& referrer() const { return referrer_; }
 
-  void set_page_state(const PageState& page_state) { page_state_ = page_state; }
-  const PageState& page_state() const { return page_state_; }
+  void set_frame_state(const ExplodedFrameState& frame_state) {
+    frame_state_ = frame_state;
+  }
+  const ExplodedFrameState& frame_state() const { return frame_state_; }
 
  private:
   friend class base::RefCounted<FrameNavigationEntry>;
@@ -111,6 +114,7 @@ class CONTENT_EXPORT FrameNavigationEntry
   // Add all new fields to |UpdateEntry|.
   // TODO(creis): These fields have implications for session restore.  This is
   // currently managed by NavigationEntry, but the logic will move here.
+  // TODO(creis): Update this comment.
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
@@ -121,8 +125,8 @@ class CONTENT_EXPORT FrameNavigationEntry
   scoped_refptr<SiteInstanceImpl> site_instance_;
   GURL url_;
   Referrer referrer_;
-  // TODO(creis): Change this to FrameState.
-  PageState page_state_;
+  // TODO(creis): Drop ISN/DSN; add list of referenced files.
+  ExplodedFrameState frame_state_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameNavigationEntry);
 };