Index: content/renderer/render_view_browsertest.cc |
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc |
index e9ab0dc6c3ef0e111000a301a4dc0c5eabc848c3..e778fdc90c54a18f51a6a9a982936c9227193680 100644 |
--- a/content/renderer/render_view_browsertest.cc |
+++ b/content/renderer/render_view_browsertest.cc |
@@ -48,6 +48,7 @@ |
#include "third_party/WebKit/public/platform/WebURLResponse.h" |
#include "third_party/WebKit/public/web/WebDataSource.h" |
#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h" |
+#include "third_party/WebKit/public/web/WebHistoryCommitType.h" |
#include "third_party/WebKit/public/web/WebHistoryItem.h" |
#include "third_party/WebKit/public/web/WebLocalFrame.h" |
#include "third_party/WebKit/public/web/WebPerformance.h" |
@@ -1613,7 +1614,8 @@ TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) { |
RequestNavigationParams()); |
// An error occurred. |
- view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error); |
+ view()->GetMainRenderFrame()->didFailProvisionalLoad( |
+ web_frame, error, blink::WebStandardCommit); |
// Frame should exit view-source mode. |
EXPECT_FALSE(web_frame->isViewSourceModeEnabled()); |
} |
@@ -1635,7 +1637,8 @@ TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) { |
RequestNavigationParams()); |
// A cancellation occurred. |
- view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error); |
+ view()->GetMainRenderFrame()->didFailProvisionalLoad( |
+ web_frame, error, blink::WebStandardCommit); |
// Frame should stay in view-source mode. |
EXPECT_TRUE(web_frame->isViewSourceModeEnabled()); |
} |
@@ -2032,7 +2035,8 @@ TEST_F(SuppressErrorPageTest, MAYBE_Suppresses) { |
RequestNavigationParams()); |
// An error occurred. |
- view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error); |
+ view()->GetMainRenderFrame()->didFailProvisionalLoad( |
+ web_frame, error, blink::WebStandardCommit); |
const int kMaxOutputCharacters = 22; |
EXPECT_EQ("", |
base::UTF16ToASCII(web_frame->contentAsText(kMaxOutputCharacters))); |
@@ -2061,7 +2065,8 @@ TEST_F(SuppressErrorPageTest, MAYBE_DoesNotSuppress) { |
RequestNavigationParams()); |
// An error occurred. |
- view()->GetMainRenderFrame()->didFailProvisionalLoad(web_frame, error); |
+ view()->GetMainRenderFrame()->didFailProvisionalLoad( |
+ web_frame, error, blink::WebStandardCommit); |
// The error page itself is loaded asynchronously. |
FrameLoadWaiter(frame()).Wait(); |
const int kMaxOutputCharacters = 22; |