1 files changed, 37 insertions, 21 deletions

diff --git a/chromium/content/renderer/fetchers/resource_fetcher_impl.cc b/chromium/content/renderer/fetchers/resource_fetcher_impl.cc
index c175abcd79a..e296937f13e 100644
--- a/chromium/content/renderer/fetchers/resource_fetcher_impl.cc
+++ b/chromium/content/renderer/fetchers/resource_fetcher_impl.cc
@@ -9,8 +9,8 @@
 #include "base/time/time.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPBody.h"
+#include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ -18,15 +18,6 @@
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
 
-using base::TimeDelta;
-using blink::WebFrame;
-using blink::WebHTTPBody;
-using blink::WebSecurityPolicy;
-using blink::WebURLError;
-using blink::WebURLLoader;
-using blink::WebURLRequest;
-using blink::WebURLResponse;
-
 namespace content {
 
 // static
@@ -54,7 +45,7 @@ void ResourceFetcherImpl::SetBody(const std::string& body) {
   DCHECK(!request_.isNull());
   DCHECK(!loader_);
 
-  WebHTTPBody web_http_body;
+  blink::WebHTTPBody web_http_body;
   web_http_body.initialize();
   web_http_body.appendData(blink::WebData(body));
   request_.setHTTPBody(web_http_body);
@@ -66,10 +57,11 @@ void ResourceFetcherImpl::SetHeader(const std::string& header,
   DCHECK(!loader_);
 
   if (LowerCaseEqualsASCII(header, "referer")) {
-    blink::WebString referrer = WebSecurityPolicy::generateReferrerHeader(
-        blink::WebReferrerPolicyDefault,
-        request_.url(),
-        blink::WebString::fromUTF8(value));
+    blink::WebString referrer =
+        blink::WebSecurityPolicy::generateReferrerHeader(
+            blink::WebReferrerPolicyDefault,
+            request_.url(),
+            blink::WebString::fromUTF8(value));
     request_.setHTTPReferrer(referrer, blink::WebReferrerPolicyDefault);
   } else {
     request_.setHTTPHeaderField(blink::WebString::fromUTF8(header),
@@ -77,11 +69,35 @@ void ResourceFetcherImpl::SetHeader(const std::string& header,
   }
 }
 
-void ResourceFetcherImpl::Start(WebFrame* frame,
-                                WebURLRequest::RequestContext request_context,
-                                WebURLRequest::FrameType frame_type,
-                                LoaderType loader_type,
-                                const Callback& callback) {
+void ResourceFetcherImpl::SetSkipServiceWorker(bool skip_service_worker) {
+  DCHECK(!request_.isNull());
+  DCHECK(!loader_);
+
+  request_.setSkipServiceWorker(skip_service_worker);
+}
+
+void ResourceFetcherImpl::SetCachePolicy(
+    blink::WebURLRequest::CachePolicy policy) {
+  DCHECK(!request_.isNull());
+  DCHECK(!loader_);
+
+  request_.setCachePolicy(policy);
+}
+
+void ResourceFetcherImpl::SetLoaderOptions(
+    const blink::WebURLLoaderOptions& options) {
+  DCHECK(!request_.isNull());
+  DCHECK(!loader_);
+
+  options_ = options;
+}
+
+void ResourceFetcherImpl::Start(
+    blink::WebFrame* frame,
+    blink::WebURLRequest::RequestContext request_context,
+    blink::WebURLRequest::FrameType frame_type,
+    LoaderType loader_type,
+    const Callback& callback) {
   DCHECK(!loader_);
   DCHECK(!request_.isNull());
   DCHECK(callback_.is_null());
@@ -101,7 +117,7 @@ void ResourceFetcherImpl::Start(WebFrame* frame,
       loader_.reset(blink::Platform::current()->createURLLoader());
       break;
     case FRAME_ASSOCIATED_LOADER:
-      loader_.reset(frame->createAssociatedURLLoader());
+      loader_.reset(frame->createAssociatedURLLoader(options_));
       break;
   }
   loader_->loadAsynchronously(request_, this);