Revert 113006 - Make TestTabContents::TestDidNavigate not take a ViewHostMsg_FrameNavigate_Params...

content/browser/tab_contents/test_tab_contents.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_
 #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;
 
 // Subclass TabContents to ensure it creates TestRenderViewHosts and does
 // not do anything involving views.
 class TestTabContents : public TabContents {
  public:
   TestTabContents(content::BrowserContext* browser_context,
                   SiteInstance* instance);
   virtual ~TestTabContents();
 
   TestRenderViewHost* pending_rvh() const;
 
   // State accessor.
   bool cross_navigation_pending() {
     return render_manager_.cross_navigation_pending_;
   }
 
   // Overrides TabContents::ShouldTransitionCrossSite so that we can test both
   // 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() {
     return GetWebkitPrefs();
   }
 
   // Prevent interaction with views.
   virtual bool CreateRenderViewForRenderManager(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE {}
@@ skipping 43 matching lines @@
 
   // Expectations for arguments of |SetHistoryLengthAndPrune()|.
   bool expect_set_history_length_and_prune_;
   scoped_refptr<const SiteInstance>
     expect_set_history_length_and_prune_site_instance_;
   int expect_set_history_length_and_prune_history_length_;
   int32 expect_set_history_length_and_prune_min_page_id_;
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_TEST_TAB_CONTENTS_H_