[content shell] prune the history as soon as a pending navigation entry for the next layout test exists

Since we prune the history asynchronously from the browser, we need to prune it
before the renderer had a chance to access it for the next test.

BUG=171128
TEST=history tests don't report a too long session history

Review URL: https://codereview.chromium.org/12483009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188744 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 7 deletions

diff --git a/content/shell/webkit_test_controller.h b/content/shell/webkit_test_controller.h
index bf18e3b..7474e45 100644
--- a/content/shell/webkit_test_controller.h
+++ b/content/shell/webkit_test_controller.h
@@ -106,9 +106,6 @@ class WebKitTestController : public base::NonThreadSafe,
                              base::ProcessId plugin_pid) OVERRIDE;
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
-  virtual void DidNavigateMainFrame(
-      const LoadCommittedDetails& details,
-      const FrameNavigateParams& params) OVERRIDE;
   virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
 
   // NotificationObserver implementation.
@@ -140,6 +137,7 @@ class WebKitTestController : public base::NonThreadSafe,
   void OnLoadURLForFrame(const GURL& url, const std::string& frame_name);
   void OnCaptureSessionHistory();
   void OnCloseRemainingWindows();
+  void OnResetDone();
 
   scoped_ptr<WebKitTestResultPrinter> printer_;
 
@@ -151,10 +149,6 @@ class WebKitTestController : public base::NonThreadSafe,
   // The PID of the render process of the render view host of main_window_.
   int current_pid_;
 
-  // True if we should prune all but the active navigation entry of main_window_
-  // on the next commit of a main frame navigation.
-  bool prune_history_;
-
   // True if we should set the test configuration to the next RenderViewHost
   // created.
   bool send_configuration_to_next_host_;