OOPIF: Stop using HistoryController and refactor UpdateState.

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 d56b60bf2adbc1d3b7ccc33924728094315f7e2e..71142de5dead22160dace976dbfcd12c2f446bb5 100644
--- a/content/test/test_render_view_host.cc
+++ b/content/test/test_render_view_host.cc
@@ -12,6 +12,7 @@
 #include "content/browser/site_instance_impl.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/common/frame_messages.h"
+#include "content/common/site_isolation_policy.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
@@ -298,11 +299,13 @@ void TestRenderViewHost::TestOnStartDragging(
 void TestRenderViewHost::TestOnUpdateStateWithFile(
     int page_id,
     const base::FilePath& file_path) {
-  OnUpdateState(page_id,
-                PageState::CreateForTesting(GURL("http://www.google.com"),
-                                            false,
-                                            "data",
-                                            &file_path));
+  PageState state = PageState::CreateForTesting(GURL("http://www.google.com"),
+                                                false, "data", &file_path);
+  if (SiteIsolationPolicy::UseSubframeNavigationEntries()) {
+    static_cast<RenderFrameHostImpl*>(GetMainFrame())->OnUpdateState(state);
+  } else {
+    OnUpdateState(page_id, state);
+  }
 }
 
 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() {