ResourceFetcher: Add POST support and the ability to set headers

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 131 matching lines @@
   RenderView* GetRenderView() {
     // We could have the test on the UI thread get the WebContent's routing ID,
     // but we know this will be the first RV so skip that and just hardcode it.
     return RenderView::FromRoutingID(kRenderViewRoutingId);
   }
 
   void ResourceFetcherDownloadOnRenderer(const GURL& url) {
     WebFrame* frame = GetRenderView()->GetWebView()->mainFrame();
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
-    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
-        url, frame, WebURLRequest::TargetIsMainFrame, delegate->NewCallback()));
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   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();
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
-    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
-        url, frame, WebURLRequest::TargetIsMainFrame, delegate->NewCallback()));
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   delegate->NewCallback());
 
     delegate->WaitForResponse();
 
     ASSERT_TRUE(delegate->completed());
     EXPECT_EQ(delegate->response().httpStatusCode(), 404);
     EXPECT_TRUE(delegate->data().find("Not Found.") != std::string::npos);
   }
 
   void ResourceFetcherDidFailOnRenderer() {
     WebFrame* frame = GetRenderView()->GetWebView()->mainFrame();
 
     // Try to fetch a page on a site that doesn't exist.
     GURL url("http://localhost:1339/doesnotexist");
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
-    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
-        url, frame, WebURLRequest::TargetIsMainFrame, delegate->NewCallback()));
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   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();
 
     scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
-    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
-        url, frame, WebURLRequest::TargetIsMainFrame,
-        delegate->NewCallback()));
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   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();
 
     scoped_ptr<EvilFetcherDelegate> delegate(new EvilFetcherDelegate);
-    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(
-        url, frame, WebURLRequest::TargetIsMainFrame,
-        delegate->NewCallback()));
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   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();
+
+    scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->SetMethod("POST");
+    fetcher->SetBody(kBody);
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   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();
+
+    scoped_ptr<FetcherDelegate> delegate(new FetcherDelegate);
+    scoped_ptr<ResourceFetcher> fetcher(ResourceFetcher::Create(url));
+    fetcher->SetHeader("header", kHeader);
+    fetcher->Start(frame, WebURLRequest::TargetIsMainFrame,
+                   delegate->NewCallback());
+
+    delegate->WaitForResponse();
+    ASSERT_TRUE(delegate->completed());
+    EXPECT_EQ(delegate->response().httpStatusCode(), 200);
+    EXPECT_EQ(kHeader, delegate->data());
+  }
 };
 
 // Test a fetch from the test server.
 // If this flakes, use http://crbug.com/51622.
 IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherDownload) {
   // Need to spin up the renderer.
   NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("files/simple_page.html"));
@@ skipping 48 matching lines @@
   // timeout in 0 sec.
   ASSERT_TRUE(test_server()->Start());
   GURL url(test_server()->GetURL("slow?1"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &ResourceFetcherTests::ResourceFetcherDeletedInCallbackOnRenderer,
             base::Unretained(this), url));
 }
 
+// Test that ResourceFetchers can handle POSTs.
+IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherPost) {
+  // Need to spin up the renderer.
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
+
+  // Grab a page that echos the POST body.
+  ASSERT_TRUE(test_server()->Start());
+  GURL url(test_server()->GetURL("echo"));
+
+  PostTaskToInProcessRendererAndWait(
+        base::Bind(
+            &ResourceFetcherTests::ResourceFetcherPost,
+            base::Unretained(this), url));
+}
+
+// Test that ResourceFetchers can set headers.
+IN_PROC_BROWSER_TEST_F(ResourceFetcherTests, ResourceFetcherSetHeader) {
+  // Need to spin up the renderer.
+  NavigateToURL(shell(), GURL(kAboutBlankURL));
+
+  // Grab a page that echos the POST body.
+  ASSERT_TRUE(test_server()->Start());
+  GURL url(test_server()->GetURL("echoheader?header"));
+
+  PostTaskToInProcessRendererAndWait(
+        base::Bind(
+            &ResourceFetcherTests::ResourceFetcherSetHeader,
+            base::Unretained(this), url));
+}
+
 }  // namespace content