Make TestTabContents::TestDidNavigate not take a ViewHostMsg_FrameNavigate_Params, since that's a...

chrome/browser/chromeos/offline/offline_load_page_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/offline/offline_load_page.h"
 #include "chrome/browser/renderer_host/offline_resource_handler.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
-#include "content/common/view_messages.h"
 #include "content/test/test_browser_thread.h"
 
 using content::BrowserThread;
 
 static const char* kURL1 = "http://www.google.com/";
 static const char* kURL2 = "http://www.gmail.com/";
 
 namespace chromeos {
 
 class OfflineLoadPageTest;
@@ skipping 46 matching lines @@
   }
 
   void OnBlockingPageComplete(bool proceed) {
     if (proceed)
       user_response_ = OK;
     else
       user_response_ = CANCEL;
   }
 
   void Navigate(const char* url, int page_id) {
-    ViewHostMsg_FrameNavigate_Params params;
-    InitNavigateParams(
-        &params, page_id, GURL(url), content::PAGE_TRANSITION_TYPED);
-    contents()->TestDidNavigate(contents()->render_view_host(), params);
+    contents()->TestDidNavigate(
+        contents()->render_view_host(), page_id, GURL(url),
+        content::PAGE_TRANSITION_TYPED);
   }
 
   void ShowInterstitial(const char* url) {
     (new TestOfflineLoadPage(contents(), GURL(url), this))->Show();
   }
 
   // Returns the OfflineLoadPage currently showing or NULL if none is
   // showing.
   InterstitialPage* GetOfflineLoadPage() {
     return InterstitialPage::GetInterstitialPage(contents());
@@ skipping 64 matching lines @@
   // The interstitial should be gone.
   EXPECT_EQ(CANCEL, user_response());
   EXPECT_FALSE(GetOfflineLoadPage());
   // We did not proceed, the pending entry should be gone.
   EXPECT_FALSE(controller().pending_entry());
   // the URL is set back to kURL1.
   EXPECT_EQ(kURL1, contents()->GetURL().spec());
 }
 
 }  // namespace chromeos