Revert of Clean up the page state saving mechanism.

content/shell/renderer/layout_test/webkit_test_runner.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/shell/renderer/layout_test/webkit_test_runner.h"
 
 #include <algorithm>
 #include <clocale>
 #include <cmath>
 
@@ skipping 89 matching lines @@
   task->run();
   delete task;
 }
 
 class SyncNavigationStateVisitor : public RenderViewVisitor {
  public:
   SyncNavigationStateVisitor() {}
   ~SyncNavigationStateVisitor() override {}
 
   bool Visit(RenderView* render_view) override {
-    ForcePageStateFlush(render_view);
+    SyncNavigationState(render_view);
     return true;
   }
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncNavigationStateVisitor);
 };
 
 class ProxyToRenderViewVisitor : public RenderViewVisitor {
  public:
   explicit ProxyToRenderViewVisitor(WebTestProxyBase* proxy)
       : proxy_(proxy),
@@ skipping 633 matching lines @@
 
   leak_detector_->TryLeakDetection(main_frame);
 }
 
 void WebKitTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 }  // namespace content