Set the same headers for data URLs in WebURLLoaderImpl and ResourceFetcher

third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
index 1d35e159ac55f11d369f885c2958d02f23da2541..e50a08f3d2e6965d007dfb128eb0d87c87085ec3 100644
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceFetcher.cpp
@@ -363,33 +363,30 @@ Resource* ResourceFetcher::resourceForStaticData(
     memoryCache()->remove(oldResource);
   }
 
-  AtomicString mimetype;
-  AtomicString charset;
+  ResourceResponse response;
   RefPtr<SharedBuffer> data;
   if (substituteData.isValid()) {
-    mimetype = substituteData.mimeType();
-    charset = substituteData.textEncoding();
     data = substituteData.content();
+    response.setURL(url);
+    response.setMimeType(substituteData.mimeType());
+    response.setExpectedContentLength(data->size());
+    response.setTextEncodingName(substituteData.textEncoding());
   } else if (url.protocolIsData()) {
-    data = PassRefPtr<SharedBuffer>(
-        NetworkUtils::parseDataURL(url, mimetype, charset));
+    data = PassRefPtr<SharedBuffer>(NetworkUtils::parseDataURL(url, response));
     if (!data)
       return nullptr;
+    // |response| is modified by parseDataURL() and is ready to be used.
   } else {
     ArchiveResource* archiveResource =
         m_archive->subresourceForURL(request.url());
     // Fall back to the network if the archive doesn't contain the resource.
     if (!archiveResource)
       return nullptr;
-    mimetype = archiveResource->mimeType();
-    charset = archiveResource->textEncoding();
     data = archiveResource->data();
-  }
-
-  ResourceResponse response(url, mimetype, data->size(), charset);
-  if (!substituteData.isValid() && url.protocolIsData()) {
-    response.setHTTPStatusCode(200);
-    response.setHTTPStatusText("OK");
+    response.setURL(url);
+    response.setMimeType(archiveResource->mimeType());
+    response.setExpectedContentLength(data->size());
+    response.setTextEncodingName(archiveResource->textEncoding());
   }
 
   Resource* resource = factory.create(request.resourceRequest(),