| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 92f07517273945b534430672c8a850ccdf92132b..6862bc24d2b22f423116a680b569aa9c017e8308 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -1634,7 +1634,7 @@ TEST_F(RenderViewImplTest, DISABLED_DidFailProvisionalLoadWithErrorForError) {
|
|
|
| // An error occurred.
|
| view()->GetMainRenderFrame()->didFailProvisionalLoad(
|
| - web_frame, error, blink::WebStandardCommit);
|
| + web_frame->provisionalDataSource(), error, blink::WebStandardCommit);
|
| // Frame should exit view-source mode.
|
| EXPECT_FALSE(web_frame->isViewSourceModeEnabled());
|
| }
|
| @@ -1657,7 +1657,7 @@ TEST_F(RenderViewImplTest, DidFailProvisionalLoadWithErrorForCancellation) {
|
|
|
| // A cancellation occurred.
|
| view()->GetMainRenderFrame()->didFailProvisionalLoad(
|
| - web_frame, error, blink::WebStandardCommit);
|
| + web_frame->provisionalDataSource(), error, blink::WebStandardCommit);
|
| // Frame should stay in view-source mode.
|
| EXPECT_TRUE(web_frame->isViewSourceModeEnabled());
|
| }
|
| @@ -2062,8 +2062,8 @@ TEST_F(RendererErrorPageTest, MAYBE_Suppresses) {
|
| RequestNavigationParams());
|
|
|
| // An error occurred.
|
| - main_frame->didFailProvisionalLoad(web_frame, error,
|
| - blink::WebStandardCommit);
|
| + main_frame->didFailProvisionalLoad(
|
| + web_frame->provisionalDataSource(), error, blink::WebStandardCommit);
|
| const int kMaxOutputCharacters = 22;
|
| EXPECT_EQ("", base::UTF16ToASCII(
|
| base::StringPiece16(web_frame->contentAsText(kMaxOutputCharacters))));
|
| @@ -2093,8 +2093,8 @@ TEST_F(RendererErrorPageTest, MAYBE_DoesNotSuppress) {
|
| RequestNavigationParams());
|
|
|
| // An error occurred.
|
| - main_frame->didFailProvisionalLoad(web_frame, error,
|
| - blink::WebStandardCommit);
|
| + main_frame->didFailProvisionalLoad(
|
| + web_frame->provisionalDataSource(), error, blink::WebStandardCommit);
|
|
|
| // The error page itself is loaded asynchronously.
|
| FrameLoadWaiter(main_frame).Wait();
|
| @@ -2226,7 +2226,8 @@ TEST_F(RenderViewImplTest, ServiceWorkerNetworkProviderSetup) {
|
| blink::WebURLRequest request(GURL("http://foo.com"));
|
| request.setRequestContext(blink::WebURLRequest::RequestContextSubresource);
|
| blink::WebURLResponse redirect_response;
|
| - frame()->willSendRequest(GetMainFrame(), 0, request, redirect_response);
|
| + frame()->willSendRequest(
|
| + GetMainFrame()->dataSource(), 0, request, redirect_response);
|
| extra_data = static_cast<RequestExtraData*>(request.extraData());
|
| ASSERT_TRUE(extra_data);
|
| EXPECT_EQ(extra_data->service_worker_provider_id(),
|
|
|