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

Unified Diff: content/renderer/render_view_browsertest.cc

Issue 118553006: Move DidFailProvisionalLoad handling from RenderView(Host) to RenderFrame(Host). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on ToT. Created 6 years, 11 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/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 9e2b99779a06b64acb795e344a90f1955c792c74..d2d7d24ce4db6233b0df58d2f200521355537f10 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -1559,7 +1559,7 @@ TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) {
view()->OnNavigate(params);
// An error occurred.
- view()->didFailProvisionalLoad(web_frame, error);
+ view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
// Frame should exit view-source mode.
EXPECT_FALSE(web_frame->isViewSourceModeEnabled());
}
@@ -1581,7 +1581,7 @@ TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) {
view()->OnNavigate(params);
// A cancellation occurred.
- view()->didFailProvisionalLoad(web_frame, error);
+ view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
// Frame should stay in view-source mode.
EXPECT_TRUE(web_frame->isViewSourceModeEnabled());
}
@@ -2113,7 +2113,7 @@ TEST_F(SuppressErrorPageTest, MAYBE_Suppresses) {
view()->OnNavigate(params);
// An error occurred.
- view()->didFailProvisionalLoad(web_frame, error);
+ view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
const int kMaxOutputCharacters = 22;
EXPECT_EQ("", UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters)));
}
@@ -2141,7 +2141,7 @@ TEST_F(SuppressErrorPageTest, MAYBE_DoesNotSuppress) {
view()->OnNavigate(params);
// An error occurred.
- view()->didFailProvisionalLoad(web_frame, error);
+ view()->main_render_frame()->didFailProvisionalLoad(web_frame, error);
ProcessPendingMessages();
const int kMaxOutputCharacters = 22;
EXPECT_EQ("A suffusion of yellow.",
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698