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

Unified Diff: content/renderer/resource_fetcher_browsertest.cc

Issue 2869663002: ResourceFetcher::Start should be given a WebLocalFrame (Closed)
Patch Set: fix Created 3 years, 7 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/mojo_context_state.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/resource_fetcher_browsertest.cc
diff --git a/content/renderer/resource_fetcher_browsertest.cc b/content/renderer/resource_fetcher_browsertest.cc
index c1d601688979ec432c1a9316459f096d7c549c18..832e6017fd8f8300934aa9754b55ce13a49f288a 100644
--- a/content/renderer/resource_fetcher_browsertest.cc
+++ b/content/renderer/resource_fetcher_browsertest.cc
@@ -26,7 +26,6 @@
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebView.h"
-using blink::WebFrame;
using blink::WebURLRequest;
using blink::WebURLResponse;
@@ -149,7 +148,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
}
void ResourceFetcherDownloadOnRenderer(const GURL& url) {
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
@@ -165,7 +165,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
}
void ResourceFetcher404OnRenderer(const GURL& url) {
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
@@ -179,7 +180,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
}
void ResourceFetcherDidFailOnRenderer() {
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
// Try to fetch a page on a site that doesn't exist.
GURL url("http://localhost:1339/doesnotexist");
@@ -199,7 +201,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
}
void ResourceFetcherTimeoutOnRenderer(const GURL& url) {
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
@@ -218,7 +221,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
}
void ResourceFetcherDeletedInCallbackOnRenderer(const GURL& url) {
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<EvilFetcherDelegate> delegate(new EvilFetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
@@ -234,7 +238,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
void ResourceFetcherPost(const GURL& url) {
const char* kBody = "Really nifty POST body!";
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
@@ -252,7 +257,8 @@ class ResourceFetcherTests : public ContentBrowserTest {
void ResourceFetcherSetHeader(const GURL& url) {
const char* kHeader = "Rather boring header.";
- WebFrame* frame = GetRenderView()->GetWebView()->MainFrame();
+ blink::WebLocalFrame* frame =
+ GetRenderView()->GetWebView()->MainFrame()->ToWebLocalFrame();
std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
« no previous file with comments | « content/renderer/mojo_context_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698