ResourceFetcher::Start should be given a WebLocalFrame

content/renderer/resource_fetcher_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/renderer/resource_fetcher.h"
 
 #include <stdint.h>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #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;
 
 namespace content {
 
 static const int kMaxWaitTimeMs = 5000;
 
 class FetcherDelegate {
  public:
   FetcherDelegate()
@@ skipping 102 matching lines @@
   void SetUpOnMainThread() override {
     render_view_routing_id_ =
         shell()->web_contents()->GetRenderViewHost()->GetRoutingID();
   }
 
   RenderView* GetRenderView() {
     return RenderView::FromRoutingID(render_view_routing_id_);
   }
 
   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));
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
 
     ASSERT_TRUE(delegate->completed());
     EXPECT_EQ(delegate->response().HttpStatusCode(), 200);
     std::string text = delegate->data();
     EXPECT_TRUE(text.find("Basic html test.") != std::string::npos);
   }
 
   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));
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
 
     ASSERT_TRUE(delegate->completed());
     EXPECT_EQ(delegate->response().HttpStatusCode(), 404);
   }
 
   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");
     std::unique_ptr<FetcherDelegate> delegate(new FetcherDelegate);
     std::unique_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
 
     // When we fail, we still call the Delegate callback but we pass in empty
     // values.
     EXPECT_TRUE(delegate->completed());
     EXPECT_TRUE(delegate->response().IsNull());
     EXPECT_EQ(delegate->data(), std::string());
     EXPECT_FALSE(delegate->timed_out());
   }
 
   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));
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
     fetcher->SetTimeout(base::TimeDelta());
 
     delegate->WaitForResponse();
 
     // When we timeout, we still call the Delegate callback but we pass in empty
     // values.
     EXPECT_TRUE(delegate->completed());
     EXPECT_TRUE(delegate->response().IsNull());
     EXPECT_EQ(delegate->data(), std::string());
     EXPECT_FALSE(delegate->timed_out());
   }
 
   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));
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
     fetcher->SetTimeout(base::TimeDelta());
     delegate->SetFetcher(fetcher.release());
 
     delegate->WaitForResponse();
     EXPECT_FALSE(delegate->timed_out());
   }
 
   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));
     fetcher->SetMethod("POST");
     fetcher->SetBody(kBody);
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
     ASSERT_TRUE(delegate->completed());
     EXPECT_EQ(delegate->response().HttpStatusCode(), 200);
     EXPECT_EQ(kBody, delegate->data());
   }
 
   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));
     fetcher->SetHeader("header", kHeader);
     fetcher->Start(frame, WebURLRequest::kRequestContextInternal,
                    delegate->NewCallback());
 
     delegate->WaitForResponse();
     ASSERT_TRUE(delegate->completed());
     EXPECT_EQ(delegate->response().HttpStatusCode(), 200);
@@ skipping 95 matching lines @@
   ASSERT_TRUE(embedded_test_server()->Start());
   GURL url(embedded_test_server()->GetURL("/echoheader?header"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherSetHeader,
             base::Unretained(this), url));
 }
 
 }  // namespace content