Fix Mojo's WebURLLoader so that it provides protocol version and headers.

mojo/services/html_viewer/weburlloader_impl.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 "mojo/services/html_viewer/weburlloader_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/html_viewer/blink_url_request_type_converters.h"
 #include "mojo/services/public/interfaces/network/network_service.mojom.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoadTiming.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 
 namespace mojo {
 namespace {
 
+static blink::WebURLResponse::HTTPVersion StatusLineToHTTPVersion(
+    const String& status_line) {
+  if (status_line.is_null())
+    return blink::WebURLResponse::HTTP_0_9;
+
+  if (StartsWithASCII(status_line, "HTTP/1.0", true))
+    return blink::WebURLResponse::HTTP_1_0;
+
+  if (StartsWithASCII(status_line, "HTTP/1.1", true))
+    return blink::WebURLResponse::HTTP_1_1;
+
+  return blink::WebURLResponse::Unknown;
+}
+
 blink::WebURLResponse ToWebURLResponse(const URLResponsePtr& url_response) {
   blink::WebURLResponse result;
   result.initialize();
   result.setURL(GURL(url_response->url));
   result.setMIMEType(blink::WebString::fromUTF8(url_response->mime_type));
   result.setTextEncodingName(blink::WebString::fromUTF8(url_response->charset));
+  result.setHTTPVersion(StatusLineToHTTPVersion(url_response->status_line));
   result.setHTTPStatusCode(url_response->status_code);
 
   // TODO(darin): Initialize timing properly.
   blink::WebURLLoadTiming timing;
   timing.initialize();
   result.setLoadTiming(timing);
 
-  // TODO(darin): Copy other fields.
+  for (size_t i = 0; i < url_response->headers.size(); ++i) {
+    const std::string& header_line = url_response->headers[i];
+    size_t first_colon = header_line.find(":");
+
+    if (first_colon == std::string::npos || first_colon == 0)
+      continue;
+
+    std::string value;
+    TrimWhitespaceASCII(header_line.substr(first_colon + 1),
+                        base::TRIM_LEADING,
+                        &value);
+    result.setHTTPHeaderField(
+        blink::WebString::fromUTF8(header_line.substr(0, first_colon)),
+        blink::WebString::fromUTF8(value));
+  }
+
   return result;
 }
 
 }  // namespace
 
 WebURLRequestExtraData::WebURLRequestExtraData() {
 }
 
 WebURLRequestExtraData::~WebURLRequestExtraData() {
 }
@@ skipping 138 matching lines @@
       MOJO_DEADLINE_INDEFINITE,
       base::Bind(&WebURLLoaderImpl::OnResponseBodyStreamReady,
                  weak_factory_.GetWeakPtr()));
 }
 
 void WebURLLoaderImpl::OnResponseBodyStreamReady(MojoResult result) {
   ReadMore();
 }
 
 }  // namespace mojo