Revert of Clean up the page state saving mechanism.

content/public/test/render_view_test.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/render_view_test.h"
 
 #include "base/run_loop.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
@@ skipping 362 matching lines @@
   item.initialize();
   impl->GetMainRenderFrame()->didNavigateWithinPage(
       frame,
       item,
       is_new_navigation ? blink::WebStandardCommit
                         : blink::WebHistoryInertCommit);
 }
 
 void RenderViewTest::SendContentStateImmediately() {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
-  impl->set_page_state_sent_immediately(true);
+  impl->set_send_content_state_immediately(true);
 }
 
 blink::WebWidget* RenderViewTest::GetWebWidget() {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   return impl->webwidget();
 }
 
 
 ContentClient* RenderViewTest::CreateContentClient() {
   return new TestContentClient;
@@ skipping 28 matching lines @@
   FrameMsg_Navigate navigate_message(impl->GetMainRenderFrame()->GetRoutingID(),
                                      navigate_params);
   impl->GetMainRenderFrame()->OnMessageReceived(navigate_message);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();
 }
 
 }  // namespace content