Remove auto commit from TestTabContents. This is the thing preventing me from

replacing it with WebContents. Fortunately, only one test was affected.
Review URL: http://codereview.chromium.org/66003

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

1 files changed, 25 insertions, 1 deletions

diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc
index 35b3dafc..3c2e879 100644
--- a/chrome/test/browser_with_test_window_test.cc
+++ b/chrome/test/browser_with_test_window_test.cc
@@ -5,6 +5,7 @@
 #include "chrome/test/browser_with_test_window_test.h"
 
 #include "chrome/browser/browser.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/test/test_browser_window.h"
 #include "chrome/test/testing_profile.h"
 
@@ -43,8 +44,31 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
 
 void BrowserWithTestWindowTest::AddTestingTab(Browser* browser) {
   TestTabContents* tab_contents = tab_contents_factory_->CreateInstanceImpl();
-  tab_contents->set_commit_on_navigate(true);
   tab_contents->SetupController(profile());
   browser->tabstrip_model()->AddTabContents(
       tab_contents, 0, PageTransition::TYPED, true);
 }
+
+void BrowserWithTestWindowTest::NavigateAndCommit(
+    NavigationController* controller,
+    const GURL& url) {
+  controller->LoadURL(url, GURL(), 0);
+
+  // Commit the load.
+  // TODO(brettw) once this uses TestRenderViewHost, we should call SendNavigate
+  // on it instead of doing this stuff.
+  ViewHostMsg_FrameNavigate_Params params;
+  params.page_id = reinterpret_cast<TestTabContents*>(
+      controller->tab_contents())->GetNextPageID();
+  params.url = url;
+  params.transition = PageTransition::LINK;
+  params.should_update_history = false;
+  params.gesture = NavigationGestureUser;
+  params.is_post = false;
+  NavigationController::LoadCommittedDetails details;
+  controller->RendererDidNavigate(params, &details);
+}
+
+void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
+  NavigateAndCommit(browser()->GetSelectedTabContents()->controller(), url);
+}