| Index: content/browser/web_contents/web_contents_impl_unittest.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| index 8ac7161358eb4f900b9bffbed1b448b04d4e71a5..1f02ac02eece176ba5d8b9e166885137040f07a3 100644
|
| --- a/content/browser/web_contents/web_contents_impl_unittest.cc
|
| +++ b/content/browser/web_contents/web_contents_impl_unittest.cc
|
| @@ -9,6 +9,7 @@
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/site_instance_impl.h"
|
| #include "content/browser/webui/web_ui_controller_factory_registry.h"
|
| +#include "content/common/frame_messages.h"
|
| #include "content/common/view_messages.h"
|
| #include "content/public/browser/global_request_id.h"
|
| #include "content/public/browser/interstitial_page_delegate.h"
|
| @@ -151,7 +152,7 @@ class TestInterstitialPage : public InterstitialPageImpl {
|
| }
|
|
|
| void TestDidNavigate(int page_id, const GURL& url) {
|
| - ViewHostMsg_FrameNavigate_Params params;
|
| + FrameHostMsg_DidCommitProvisionalLoad_Params params;
|
| InitNavigateParams(¶ms, page_id, url, PAGE_TRANSITION_TYPED);
|
| DidNavigate(GetRenderViewHostForTesting(), params);
|
| }
|
| @@ -298,7 +299,7 @@ class TestWebContentsObserver : public WebContentsObserver {
|
| TEST_F(WebContentsImplTest, UpdateTitle) {
|
| NavigationControllerImpl& cont =
|
| static_cast<NavigationControllerImpl&>(controller());
|
| - ViewHostMsg_FrameNavigate_Params params;
|
| + FrameHostMsg_DidCommitProvisionalLoad_Params params;
|
| InitNavigateParams(¶ms, 0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
|
|
|
| LoadCommittedDetails details;
|
| @@ -346,7 +347,7 @@ TEST_F(WebContentsImplTest, NTPViewSource) {
|
| EXPECT_TRUE(process()->sink().GetFirstMessageMatching(
|
| ViewMsg_EnableViewSourceMode::ID));
|
|
|
| - ViewHostMsg_FrameNavigate_Params params;
|
| + FrameHostMsg_DidCommitProvisionalLoad_Params params;
|
| InitNavigateParams(¶ms, 0, kGURL, PAGE_TRANSITION_TYPED);
|
| LoadCommittedDetails details;
|
| cont.RendererDidNavigate(test_rvh(), params, &details);
|
| @@ -1093,7 +1094,7 @@ TEST_F(WebContentsImplTest, CrossSiteCantPreemptAfterUnload) {
|
| // flight. We should ignore it, wait for the unload ack, and let the pending
|
| // request continue. Otherwise, the contents may close spontaneously or stop
|
| // responding to navigation requests. (See bug 23942.)
|
| - ViewHostMsg_FrameNavigate_Params params1a;
|
| + FrameHostMsg_DidCommitProvisionalLoad_Params params1a;
|
| InitNavigateParams(¶ms1a, 2, GURL("http://www.google.com/foo"),
|
| PAGE_TRANSITION_TYPED);
|
| orig_rvh->SendNavigate(2, GURL("http://www.google.com/foo"));
|
|
|