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

content/test/test_render_view_host.cc

Index: content/test/test_render_view_host.cc
diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
index 853676801d57afb735c56ee474316b1c745b330b..7f33a72daf1ff3768646f4f602ed452aadae3ec8 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -295,11 +295,14 @@ void TestRenderViewHost::TestOnStartDragging(
 void TestRenderViewHost::TestOnUpdateStateWithFile(
     int page_id,
     const base::FilePath& file_path) {
-  PageState state = PageState::CreateForTesting(GURL("http://www.google.com"),
-                                                false, "data", &file_path);
   if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
+    ExplodedFrameState state;
+    // TODO(creis): Add a CreateForTesting for ExplodedFrameState and fill in
+    // the other parameters.
     static_cast<RenderFrameHostImpl*>(GetMainFrame())->OnUpdateState(state);
   } else {
+    PageState state = PageState::CreateForTesting(GURL("http://www.google.com"),
+                                                  false, "data", &file_path);
     OnUpdateState(page_id, state);
   }
 }