Merge ResourceRequestBodyImpl and ResourceRequestBody.

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 214 matching lines @@
     RequestExtraData* extra_data =
         static_cast<RequestExtraData*>(request.GetExtraData());
     if (extra_data->is_prefetch())
       load_flags |= net::LOAD_PREFETCH;
   }
 
   return load_flags;
 }
 
 WebHTTPBody GetWebHTTPBodyForRequestBody(
-    const scoped_refptr<ResourceRequestBodyImpl>& input) {
+    const scoped_refptr<ResourceRequestBody>& input) {
   WebHTTPBody http_body;
   http_body.Initialize();
   http_body.SetIdentifier(input->identifier());
   http_body.SetContainsPasswordData(input->contains_sensitive_info());
   for (const auto& element : *input->elements()) {
     switch (element.type()) {
-      case ResourceRequestBodyImpl::Element::TYPE_BYTES:
+      case ResourceRequestBody::Element::TYPE_BYTES:
         http_body.AppendData(WebData(element.bytes(), element.length()));
         break;
-      case ResourceRequestBodyImpl::Element::TYPE_FILE:
+      case ResourceRequestBody::Element::TYPE_FILE:
         http_body.AppendFileRange(
             blink::FilePathToWebString(element.path()), element.offset(),
             (element.length() != std::numeric_limits<uint64_t>::max())
                 ? element.length()
                 : -1,
             element.expected_modification_time().ToDoubleT());
         break;
-      case ResourceRequestBodyImpl::Element::TYPE_FILE_FILESYSTEM:
+      case ResourceRequestBody::Element::TYPE_FILE_FILESYSTEM:
         http_body.AppendFileSystemURLRange(
             element.filesystem_url(), element.offset(),
             (element.length() != std::numeric_limits<uint64_t>::max())
                 ? element.length()
                 : -1,
             element.expected_modification_time().ToDoubleT());
         break;
-      case ResourceRequestBodyImpl::Element::TYPE_BLOB:
+      case ResourceRequestBody::Element::TYPE_BLOB:
         http_body.AppendBlob(WebString::FromASCII(element.blob_uuid()));
         break;
-      case ResourceRequestBodyImpl::Element::TYPE_BYTES_DESCRIPTION:
-      case ResourceRequestBodyImpl::Element::TYPE_DISK_CACHE_ENTRY:
+      case ResourceRequestBody::Element::TYPE_BYTES_DESCRIPTION:
+      case ResourceRequestBody::Element::TYPE_DISK_CACHE_ENTRY:
       default:
         NOTREACHED();
         break;
     }
   }
   return http_body;
 }
 
-scoped_refptr<ResourceRequestBodyImpl> GetRequestBodyForWebURLRequest(
+scoped_refptr<ResourceRequestBody> GetRequestBodyForWebURLRequest(
     const blink::WebURLRequest& request) {
-  scoped_refptr<ResourceRequestBodyImpl> request_body;
+  scoped_refptr<ResourceRequestBody> request_body;
 
   if (request.HttpBody().IsNull()) {
     return request_body;
   }
 
   const std::string& method = request.HttpMethod().Latin1();
   // GET and HEAD requests shouldn't have http bodies.
   DCHECK(method != "GET" && method != "HEAD");
 
   return GetRequestBodyForWebHTTPBody(request.HttpBody());
 }
 
-scoped_refptr<ResourceRequestBodyImpl> GetRequestBodyForWebHTTPBody(
+scoped_refptr<ResourceRequestBody> GetRequestBodyForWebHTTPBody(
     const blink::WebHTTPBody& httpBody) {
-  scoped_refptr<ResourceRequestBodyImpl> request_body =
-      new ResourceRequestBodyImpl();
+  scoped_refptr<ResourceRequestBody> request_body = new ResourceRequestBody();
   size_t i = 0;
   WebHTTPBody::Element element;
   while (httpBody.ElementAt(i++, element)) {
     switch (element.type) {
       case WebHTTPBody::Element::kTypeData:
         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()));
@@ skipping 218 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.was_ignored_by_handler = was_ignored_by_handler;
   return error;
 }
 
 }  // namespace content