Use explicit WebString <-> string{16,} conversion methods for WebURLLoader files

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 227 matching lines @@
   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:
         http_body.appendData(WebData(element.bytes(), element.length()));
         break;
       case ResourceRequestBodyImpl::Element::TYPE_FILE:
         http_body.appendFileRange(
-            element.path().AsUTF16Unsafe(), element.offset(),
+            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:
         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:
-        http_body.appendBlob(WebString::fromUTF8(element.blob_uuid()));
+        http_body.appendBlob(WebString::fromASCII(element.blob_uuid()));
         break;
       case ResourceRequestBodyImpl::Element::TYPE_BYTES_DESCRIPTION:
       case ResourceRequestBodyImpl::Element::TYPE_DISK_CACHE_ENTRY:
       default:
         NOTREACHED();
         break;
     }
   }
   return http_body;
 }
@@ skipping 206 matching lines @@
 
 SkipServiceWorker GetSkipServiceWorkerForWebURLRequest(
     const blink::WebURLRequest& request) {
   return static_cast<SkipServiceWorker>(request.skipServiceWorker());
 }
 
 blink::WebURLError CreateWebURLError(const blink::WebURL& unreachable_url,
                                      bool stale_copy_in_cache,
                                      int reason) {
   blink::WebURLError error;
-  error.domain = WebString::fromUTF8(net::kErrorDomain);
+  error.domain = WebString::fromASCII(net::kErrorDomain);
   error.reason = reason;
   error.unreachableURL = unreachable_url;
   error.staleCopyInCache = stale_copy_in_cache;
   if (reason == net::ERR_ABORTED) {
     error.isCancellation = true;
   } else if (reason == net::ERR_CACHE_MISS) {
     error.isCacheMiss = true;
   } else if (reason == net::ERR_TEMPORARILY_THROTTLED) {
     error.localizedDescription =
-        WebString::fromUTF8(kThrottledErrorDescription);
+        WebString::fromASCII(kThrottledErrorDescription);
   } else {
     error.localizedDescription =
-        WebString::fromUTF8(net::ErrorToString(reason));
+        WebString::fromASCII(net::ErrorToString(reason));
   }
   return error;
 }
 
 blink::WebURLError CreateWebURLError(const blink::WebURL& unreachable_url,
                                      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