Revert of Clean up the page state saving mechanism.

content/test/layouttest_support.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/layouttest_support.h"
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "cc/blink/web_layer_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 133 matching lines @@
   PopupMenuHelper::DontShowPopupMenuForTesting();
 #endif
   RenderWidgetHostImpl::DisableResizeAckCheckForTesting();
 }
 
 int GetLocalSessionHistoryLength(RenderView* render_view) {
   return static_cast<RenderViewImpl*>(render_view)->
       GetLocalSessionHistoryLengthForTesting();
 }
 
-void ForcePageStateFlush(RenderView* render_view) {
-  static_cast<RenderViewImpl*>(render_view)->ForcePageStateFlushForTesting();
+void SyncNavigationState(RenderView* render_view) {
+  static_cast<RenderViewImpl*>(render_view)->SyncNavigationState();
 }
 
 void SetFocusAndActivate(RenderView* render_view, bool enable) {
   static_cast<RenderViewImpl*>(render_view)->
       SetFocusAndActivateForTesting(enable);
 }
 
 void ForceResizeRenderView(RenderView* render_view,
                            const WebSize& new_size) {
   RenderViewImpl* render_view_impl = static_cast<RenderViewImpl*>(render_view);
@@ skipping 221 matching lines @@
   }
   result.append("===============================================\n");
   return result;
 }
 
 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer) {
   return new cc_blink::WebLayerImpl(layer);
 }
 
 }  // namespace content