Revert of Clean up the page state saving mechanism.

content/public/test/layouttest_support.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
 #define CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 58 matching lines @@
 // a listener through BlinkPlatformImpl::setDeviceOrientationListener().
 void SetMockDeviceOrientationData(const blink::WebDeviceOrientationData& data);
 
 // Notifies blink that battery status has changed.
 void MockBatteryStatusChanged(const blink::WebBatteryStatus& status);
 
 // Returns the length of the local session history of a render view.
 int GetLocalSessionHistoryLength(RenderView* render_view);
 
 // Sync the current session history to the browser process.
-void ForcePageStateFlush(RenderView* render_view);
+void SyncNavigationState(RenderView* render_view);
 
 // Sets the focus of the render view depending on |enable|. This only overrides
 // the state of the renderer, and does not sync the focus to the browser
 // process.
 void SetFocusAndActivate(RenderView* render_view, bool enable);
 
 // Changes the window rect of the given render view.
 void ForceResizeRenderView(RenderView* render_view,
                            const blink::WebSize& new_size);
 
@@ skipping 20 matching lines @@
 // Provides a text dump of the contents of the given page state.
 std::string DumpBackForwardList(std::vector<PageState>& page_state,
                                 size_t current_index);
 
 // Instantiates WebLayerImpl for TestPlugin.
 blink::WebLayer* InstantiateWebLayer(scoped_refptr<cc::TextureLayer> layer);
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_LAYOUTTEST_SUPPORT_H_