Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: content/browser/web_contents/web_contents_impl_unittest.cc

Issue 135723003: Move DidCommitProvisionalLoad code from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing final nits. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(&params, 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(&params, 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(&params, 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(&params1a, 2, GURL("http://www.google.com/foo"),
PAGE_TRANSITION_TYPED);
orig_rvh->SendNavigate(2, GURL("http://www.google.com/foo"));
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698