CREDENTIAL: Rework the integration with Fetch (2/2)

content/child/web_url_request_util.cc

 // Copyright 2014 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/child/web_url_request_util.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 211 matching lines @@
     load_flags |= net::LOAD_DO_NOT_SEND_COOKIES;
   }
 
   if (!request.allowStoredCredentials())
     load_flags |= net::LOAD_DO_NOT_SEND_AUTH_DATA;
 
   return load_flags;
 }
 
 scoped_refptr<ResourceRequestBody> GetRequestBodyForWebURLRequest(
-    const blink::WebURLRequest& request) {
-  scoped_refptr<ResourceRequestBody> request_body;
+    const blink::WebURLRequest& request,
+    RequestBodyType type) {
+  scoped_refptr<ResourceRequestBody> body_to_return;
 
-  if (request.httpBody().isNull()) {
-    return request_body;
-  }
+  const WebHTTPBody& body =
+      type == HTTP_BODY ? request.httpBody() : request.attachedCredentialBody();
+
+  if (body.isNull())
+    return body_to_return;
 
   const std::string& method = request.httpMethod().latin1();
   // GET and HEAD requests shouldn't have http bodies.
   DCHECK(method != "GET" && method != "HEAD");
 
-  const WebHTTPBody& httpBody = request.httpBody();
-  request_body = new ResourceRequestBody();
+  body_to_return = new ResourceRequestBody();
   size_t i = 0;
   WebHTTPBody::Element element;
-  while (httpBody.elementAt(i++, element)) {
+  while (body.elementAt(i++, element)) {
     switch (element.type) {
       case WebHTTPBody::Element::TypeData:
         if (!element.data.isEmpty()) {
           // Blink sometimes gives empty data to append. These aren't
           // necessary so they are just optimized out here.
-          request_body->AppendBytes(
-              element.data.data(), static_cast<int>(element.data.size()));
+          body_to_return->AppendBytes(element.data.data(),
+                                      static_cast<int>(element.data.size()));
         }
         break;
       case WebHTTPBody::Element::TypeFile:
         if (element.fileLength == -1) {
-          request_body->AppendFileRange(
+          body_to_return->AppendFileRange(
               blink::WebStringToFilePath(element.filePath), 0,
               std::numeric_limits<uint64_t>::max(), base::Time());
         } else {
-          request_body->AppendFileRange(
+          body_to_return->AppendFileRange(
               blink::WebStringToFilePath(element.filePath),
               static_cast<uint64_t>(element.fileStart),
               static_cast<uint64_t>(element.fileLength),
               base::Time::FromDoubleT(element.modificationTime));
         }
         break;
       case WebHTTPBody::Element::TypeFileSystemURL: {
         GURL file_system_url = element.fileSystemURL;
         DCHECK(file_system_url.SchemeIsFileSystem());
-        request_body->AppendFileSystemFileRange(
+        body_to_return->AppendFileSystemFileRange(
             file_system_url, static_cast<uint64_t>(element.fileStart),
             static_cast<uint64_t>(element.fileLength),
             base::Time::FromDoubleT(element.modificationTime));
         break;
       }
       case WebHTTPBody::Element::TypeBlob:
-        request_body->AppendBlob(element.blobUUID.utf8());
+        body_to_return->AppendBlob(element.blobUUID.utf8());
         break;
       default:
         NOTREACHED();
     }
   }
-  request_body->set_identifier(request.httpBody().identifier());
-  return request_body;
+  body_to_return->set_identifier(body.identifier());
+  return body_to_return;
 }
 
 #define STATIC_ASSERT_ENUM(a, b)                            \
   static_assert(static_cast<int>(a) == static_cast<int>(b), \
                 "mismatching enums: " #a)
 
 STATIC_ASSERT_ENUM(FETCH_REQUEST_MODE_SAME_ORIGIN,
                    WebURLRequest::FetchRequestModeSameOrigin);
 STATIC_ASSERT_ENUM(FETCH_REQUEST_MODE_NO_CORS,
                    WebURLRequest::FetchRequestModeNoCORS);
@@ skipping 147 matching lines @@
                                      bool stale_copy_in_cache,
                                      int reason,
                                      bool was_ignored_by_handler) {
   blink::WebURLError error =
       CreateWebURLError(unreachable_url, stale_copy_in_cache, reason);
   error.wasIgnoredByHandler = was_ignored_by_handler;
   return error;
 }
 
 }  // namespace content