Make net::DataURL's MIME string check stricter

webkit/child/weburlloader_impl.cc

 // Copyright (c) 2012 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.
 
 // An implementation of WebURLLoader in terms of ResourceLoaderBridge.
 
 #include "webkit/child/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 114 matching lines @@
   std::string mime_type;
   std::string charset;
   if (net::DataURL::Parse(url, &mime_type, &charset, data)) {
     *error_code = net::OK;
     // Assure same time for all time fields of data: URLs.
     Time now = Time::Now();
     info->load_timing.request_start = TimeTicks::Now();
     info->load_timing.request_start_time = now;
     info->request_time = now;
     info->response_time = now;
-    info->headers = NULL;
+
+    scoped_refptr<net::HttpResponseHeaders> headers(
+        new net::HttpResponseHeaders(std::string()));
+    headers->ReplaceStatusLine("HTTP/1.1 200 OK");
+    std::string content_type_header = "Content-Type: " + mime_type;

[sof, 2013/11/08 13:34:34]

Slight inconsistency in assumptions here; you don't assume that mime_type can be
empty, but do for charset. The MIME type parser will default both, so I believe
you can simplify this ever so slightly.

[tyoshino (SeeGerritForStatus), 2013/11/12 05:47:26]

Thanks. I see. It's well documented in the comment of net::DataURL::Parse().
Replaced L140 and added DCHECKs instead

+    if (!charset.empty()) {
+      content_type_header += ";charset=";
+      content_type_header += charset;
+    }
+    headers->AddHeader(content_type_header);
+    headers->AddHeader("Access-Control-Allow-Origin: *");
+    info->headers = headers;
+
     info->mime_type.swap(mime_type);
     info->charset.swap(charset);
     info->security_info.clear();
     info->content_length = data->length();
     info->encoded_data_length = 0;
 
     return true;
   }
 
   *error_code = net::ERR_INVALID_URL;
@@ skipping 699 matching lines @@
 
 void WebURLLoaderImpl::setDefersLoading(bool value) {
   context_->SetDefersLoading(value);
 }
 
 void WebURLLoaderImpl::didChangePriority(WebURLRequest::Priority new_priority) {
   context_->DidChangePriority(new_priority);
 }
 
 }  // namespace webkit_glue