Switch content_shell from using PruneAllButActive to a more explicit approach

During layout tests, we want to reuse one WebContents for running multiple
layout tests. Since layout tests assume that they're the first entry in the
session history, we need to reset the session history.

DumpRenderTree achieved this by just killing the NavigationController. Since
that's not possible in the content module, I used the instant api
PruneAllButActive. This API, however, depends on the currently active RenderView
being the last in the session history, which is almost impossible to guarantee
in practice.

Instead, I added a flag to LoadURLParams that instructs the NavigationController
to reset itself as soon as the navigation to the next test commits.

BUG=111316
TEST=the fast/history tests don't fail flakily
TBR=creis@chromium.org, jam@chromium.org

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

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

1 files changed, 6 insertions, 0 deletions

diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index cff1d21..0e1792a 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -241,6 +241,7 @@ TestRenderViewHost::TestRenderViewHost(
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
+      simulate_history_list_was_cleared_(false),
       contents_mime_type_("text/html") {
   // For normal RenderViewHosts, this is freed when |Shutdown()| is
   // called.  For TestRenderViewHost, the view is explicitly
@@ -322,6 +323,7 @@ void TestRenderViewHost::SendNavigateWithParameters(
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.was_fetched_via_proxy = simulate_fetch_via_proxy_;
+  params.history_list_was_cleared = simulate_history_list_was_cleared_;
   params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url));
   params.original_request_url = original_request_url;
 
@@ -362,6 +364,10 @@ void TestRenderViewHost::set_simulate_fetch_via_proxy(bool proxy) {
   simulate_fetch_via_proxy_ = proxy;
 }
 
+void TestRenderViewHost::set_simulate_history_list_was_cleared(bool cleared) {
+  simulate_history_list_was_cleared_ = cleared;
+}
+
 RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() {
 }