Revert 113006 - Make TestTabContents::TestDidNavigate not take a ViewHostMsg_FrameNavigate_Params, since that's an internal content IPC struct.

BUG=98716
Review URL: http://codereview.chromium.org/8801003

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8799015

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

4 files changed, 10 insertions, 52 deletions

diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index 2991741..41618b5 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -218,7 +218,10 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   const GURL url("http://www.google.com");
   controller().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
-  contents()->TestDidNavigate(rvh(), 1, url, content::PAGE_TRANSITION_TYPED);
+  ViewHostMsg_FrameNavigate_Params params1;
+  InitNavigateParams(&params1, 1, url, content::PAGE_TRANSITION_TYPED);
+  TestRenderViewHost* orig_rvh = rvh();
+  contents()->TestDidNavigate(orig_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
 
   TestDevToolsClientHost client_host;
@@ -238,7 +241,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_TYPED, std::string());
-  contents()->TestDidNavigate(rvh(), 1, url, content::PAGE_TRANSITION_TYPED);
+  contents()->TestDidNavigate(orig_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
       DevToolsAgentHostRegistry::GetDevToolsAgentHost(rvh())));
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index 6d84a63..b3692f2 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -597,7 +597,7 @@ TEST_F(RenderViewHostManagerTest, PageDoesBackAndReload) {
   params.was_within_same_page = false;
   params.is_post = false;
   params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(kUrl2));
-  contents()->DidNavigate(evil_rvh, params);
+  contents()->TestDidNavigate(evil_rvh, params);
 
   // That should have cancelled the pending RVH, and the evil RVH should be the
   // current one.
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index 52c0cb0..95a3c59 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -11,10 +11,7 @@
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
-#include "content/common/view_messages.h"
 #include "content/public/common/page_transition_types.h"
-#include "webkit/glue/password_form.h"
-#include "webkit/glue/webkit_glue.h"
 
 TestTabContents::TestTabContents(content::BrowserContext* browser_context,
                                  SiteInstance* instance)
@@ -35,43 +32,6 @@ TestRenderViewHost* TestTabContents::pending_rvh() const {
       render_manager_.pending_render_view_host_);
 }
 
-void TestTabContents::TestDidNavigate(RenderViewHost* render_view_host,
-                                      int page_id,
-                                      const GURL& url,
-                                      content::PageTransition transition) {
-  TestDidNavigateWithReferrer(render_view_host,
-                              page_id,
-                              url,
-                              content::Referrer(),
-                              transition);
-}
-
-void TestTabContents::TestDidNavigateWithReferrer(
-    RenderViewHost* render_view_host,
-    int page_id,
-    const GURL& url,
-    const content::Referrer& referrer,
-    content::PageTransition transition) {
-  ViewHostMsg_FrameNavigate_Params params;
-
-  params.page_id = page_id;
-  params.url = url;
-  params.referrer = referrer;
-  params.transition = transition;
-  params.redirects = std::vector<GURL>();
-  params.should_update_history = false;
-  params.searchable_form_url = GURL();
-  params.searchable_form_encoding = std::string();
-  params.password_form = webkit_glue::PasswordForm();
-  params.security_info = std::string();
-  params.gesture = NavigationGestureUser;
-  params.was_within_same_page = false;
-  params.is_post = false;
-  params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url));
-
-  DidNavigate(render_view_host, params);
-}
-
 bool TestTabContents::CreateRenderViewForRenderManager(
     RenderViewHost* render_view_host) {
   // This will go to a TestRenderViewHost.
diff --git a/content/browser/tab_contents/test_tab_contents.h b/content/browser/tab_contents/test_tab_contents.h
index b6d8342..72170ab 100644
--- a/content/browser/tab_contents/test_tab_contents.h
+++ b/content/browser/tab_contents/test_tab_contents.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/common/page_transition_types.h"
 #include "webkit/glue/webpreferences.h"
 
 class TestRenderViewHost;
@@ -31,15 +30,11 @@ class TestTabContents : public TabContents {
   // alternatives without using command-line switches.
   bool ShouldTransitionCrossSite() { return transition_cross_site; }
 
+  // Promote DidNavigate to public.
   void TestDidNavigate(RenderViewHost* render_view_host,
-                       int page_id,
-                       const GURL& url,
-                       content::PageTransition transition);
-  void TestDidNavigateWithReferrer(RenderViewHost* render_view_host,
-                                   int page_id,
-                                   const GURL& url,
-                                   const content::Referrer& referrer,
-                                   content::PageTransition transition);
+                       const ViewHostMsg_FrameNavigate_Params& params) {
+    DidNavigate(render_view_host, params);
+  }
 
   // Promote GetWebkitPrefs to public.
   WebPreferences TestGetWebkitPrefs() {