OOPIF: Stop using HistoryController and refactor UpdateState.

content/renderer/history_controller.cc

Index: content/renderer/history_controller.cc
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
index 225f71748afa19537689e5e294e28b70faec1c78..2507403f1b75a3a1877e4f089528fd1043c87e9d 100644
--- a/content/renderer/history_controller.cc
+++ b/content/renderer/history_controller.cc
@@ -36,6 +36,7 @@
 #include "content/renderer/history_controller.h"
 
 #include "content/common/navigation_params.h"
+#include "content/common/site_isolation_policy.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/web/WebFrameLoadType.h"
@@ -50,6 +51,8 @@ namespace content {
 
 HistoryController::HistoryController(RenderViewImpl* render_view)
     : render_view_(render_view) {
+  // We don't use HistoryController in OOPIF enabled modes.
+  DCHECK(!SiteIsolationPolicy::UseSubframeNavigationEntries());
 }
 
 HistoryController::~HistoryController() {