Set the same headers for data URLs in WebURLLoaderImpl and ResourceFetcher

third_party/WebKit/Source/platform/network/NetworkUtils.cpp

 // Copyright 2016 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 "platform/network/NetworkUtils.h"
 
 #include "components/mime_util/mime_util.h"
 #include "net/base/data_url.h"
 #include "net/base/ip_address.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/url_util.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_request_data_job.h"
 #include "platform/SharedBuffer.h"
+#include "platform/loader/fetch/ResourceResponse.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/URLConversion.h"
 #include "public/platform/WebString.h"
 #include "url/gurl.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 #include "wtf/text/WTFString.h"
 
 namespace {
 
 net::registry_controlled_domains::PrivateRegistryFilter
@@ skipping 31 matching lines @@
 }
 
 String getDomainAndRegistry(const String& host, PrivateRegistryFilter filter) {
   StringUTF8Adaptor hostUtf8(host);
   std::string domain = net::registry_controlled_domains::GetDomainAndRegistry(
       hostUtf8.asStringPiece(), getNetPrivateRegistryFilter(filter));
   return String(domain.data(), domain.length());
 }
 
 PassRefPtr<SharedBuffer> parseDataURL(const KURL& url,
-                                      AtomicString& mimetype,
-                                      AtomicString& charset) {
+                                      ResourceResponse& response) {
+  // The following code contains duplication of GetInfoFromDataURL() and
+  // WebURLLoaderImpl::PopulateURLResponse() in
+  // content/child/web_url_loader_impl.cc. Merge them once content/child is
+  // moved to platform/.
   std::string utf8MimeType;
   std::string utf8Charset;
-  std::string data;
-  if (net::DataURL::Parse(WebStringToGURL(url.getString()), &utf8MimeType,
-                          &utf8Charset, &data) &&
-      mime_util::IsSupportedMimeType(utf8MimeType)) {
-    mimetype = WebString::fromUTF8(utf8MimeType);
-    charset = WebString::fromUTF8(utf8Charset);
-    return SharedBuffer::create(data.data(), data.size());
+  std::string dataString;
+  scoped_refptr<net::HttpResponseHeaders> headers(
+      new net::HttpResponseHeaders(std::string()));
+
+  int result = net::URLRequestDataJob::BuildResponse(
+      WebStringToGURL(url.getString()), &utf8MimeType, &utf8Charset,
+      &dataString, headers.get());
+  if (result != net::OK)
+    return nullptr;
+
+  if (!mime_util::IsSupportedMimeType(utf8MimeType))
+    return nullptr;
+
+  RefPtr<SharedBuffer> data =
+      SharedBuffer::create(dataString.data(), dataString.size());
+  response.setHTTPStatusCode(200);
+  response.setHTTPStatusText("OK");
+  response.setURL(url);
+  response.setMimeType(WebString::fromUTF8(utf8MimeType));
+  response.setExpectedContentLength(data->size());
+  response.setTextEncodingName(WebString::fromUTF8(utf8Charset));
+
+  size_t iter = 0;
+  std::string name;
+  std::string value;
+  while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
+    response.addHTTPHeaderField(WebString::fromLatin1(name),
+                                WebString::fromLatin1(value));
   }
-  return nullptr;
+  return std::move(data);

[kouhei (in TOK), 2017/03/23 00:37:15]

I don't think std::move is needed here, as we can assume NRVO

[hiroshige, 2017/03/23 03:22:23]

Done.

 }
 
 bool isRedirectResponseCode(int responseCode) {
   return net::HttpResponseHeaders::IsRedirectResponseCode(responseCode);
 }
 
 }  // NetworkUtils
 
 }  // namespace blink