Introduce Http{Request,Response} mojom structs.

The reason to stop using URL{Request,Response} for HTTP server interfaces: some
fields of those structs belong to a higher level, e.g., |auto_follow_redirects|.
It seems cleaner to define Http{Request,Response} which match the HTTP
request/response definitions.

BUG=478249
TEST=None

Review URL: https://codereview.chromium.org/1129143005

Cr-Commit-Position: refs/heads/master@{#330238}

components/html_viewer/blink_url_request_type_converters.cc

@@ -26,17 +26,17 @@ class HeaderFlattener : public blink::WebHTTPHeaderVisitor {
     if (LowerCaseEqualsASCII(name_latin1, "accept"))
       has_accept_header_ = true;
 
-    HTTPHeaderPtr header = HTTPHeader::New();
+    HttpHeaderPtr header = HttpHeader::New();
     header->name = name_latin1;
     header->value = value_latin1;
     buffer_.push_back(header.Pass());
   }
 
-  Array<HTTPHeaderPtr> GetBuffer() {
+  Array<HttpHeaderPtr> GetBuffer() {
     // In some cases, WebKit doesn't add an Accept header, but not having the
     // header confuses some web servers.  See bug 808613.
     if (!has_accept_header_) {
-      HTTPHeaderPtr header = HTTPHeader::New();
+      HttpHeaderPtr header = HttpHeader::New();
       header->name = "Accept";
       header->value = "*/*";
       buffer_.push_back(header.Pass());
@@ -46,7 +46,7 @@ class HeaderFlattener : public blink::WebHTTPHeaderVisitor {
   }
 
  private:
-  Array<HTTPHeaderPtr> buffer_;
+  Array<HttpHeaderPtr> buffer_;
   bool has_accept_header_;
 };
 

mojo/services/network/http_connection_impl.cc

@@ -83,15 +83,15 @@ class HttpConnectionImpl::SimpleDataPipeReader {
 };
 
 template <>
-struct TypeConverter<URLRequestPtr, net::HttpServerRequestInfo> {
-  static URLRequestPtr Convert(const net::HttpServerRequestInfo& obj) {
-    URLRequestPtr request(URLRequest::New());
-    request->url = obj.path;
+struct TypeConverter<HttpRequestPtr, net::HttpServerRequestInfo> {
+  static HttpRequestPtr Convert(const net::HttpServerRequestInfo& obj) {
+    HttpRequestPtr request(HttpRequest::New());
     request->method = obj.method;
+    request->url = obj.path;
     request->headers.resize(obj.headers.size());
     size_t index = 0;
     for (const auto& item : obj.headers) {
-      HTTPHeaderPtr header(HTTPHeader::New());
+      HttpHeaderPtr header(HttpHeader::New());
       header->name = item.first;
       header->value = item.second;
       request->headers[index++] = header.Pass();
@@ -104,7 +104,7 @@ struct TypeConverter<URLRequestPtr, net::HttpServerRequestInfo> {
       options.element_num_bytes = 1;
       options.capacity_num_bytes = num_bytes;
       DataPipe data_pipe(options);
-      request->body.push_back(data_pipe.consumer_handle.Pass());
+      request->body = data_pipe.consumer_handle.Pass();
       MojoResult result =
           WriteDataRaw(data_pipe.producer_handle.get(), obj.data.data(),
                        &num_bytes, MOJO_WRITE_DATA_FLAG_ALL_OR_NONE);
@@ -137,7 +137,7 @@ void HttpConnectionImpl::OnReceivedHttpRequest(
     return;
 
   delegate_->OnReceivedRequest(
-      URLRequest::From(info), [this](URLResponsePtr response) {
+      HttpRequest::From(info), [this](HttpResponsePtr response) {
         if (response->body.is_valid()) {
           SimpleDataPipeReader* reader = new SimpleDataPipeReader;
           response_body_readers_.insert(reader);
@@ -198,7 +198,7 @@ void HttpConnectionImpl::OnConnectionError() {
 }
 
 void HttpConnectionImpl::OnFinishedReadingResponseBody(
-    URLResponsePtr response,
+    HttpResponsePtr response,
     SimpleDataPipeReader* reader,
     scoped_ptr<std::string> body) {
   if (reader) {
@@ -211,7 +211,7 @@ void HttpConnectionImpl::OnFinishedReadingResponseBody(
 
   std::string content_type;
   for (size_t i = 0; i < response->headers.size(); ++i) {
-    const HTTPHeader& header = *(response->headers[i]);
+    const HttpHeader& header = *(response->headers[i]);
 
     if (body) {
       // net::HttpServerResponseInfo::SetBody() automatically sets

mojo/services/network/http_connection_impl.h

@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/services/network/public/interfaces/http_connection.mojom.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/services/network/public/interfaces/http_message.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/error_handler.h"
 
@@ -51,7 +51,7 @@ class HttpConnectionImpl : public HttpConnection,
   // ErrorHandler implementation.
   void OnConnectionError() override;
 
-  void OnFinishedReadingResponseBody(URLResponsePtr response_ptr,
+  void OnFinishedReadingResponseBody(HttpResponsePtr response_ptr,
                                      SimpleDataPipeReader* reader,
                                      scoped_ptr<std::string> body);
 

mojo/services/network/http_server_apptest.cc

@@ -68,13 +68,13 @@ std::string MakeRequestMessage(const TestRequest& data) {
   return message;
 }
 
-URLResponsePtr MakeResponseStruct(const TestResponse& data) {
-  URLResponsePtr response(URLResponse::New());
+HttpResponsePtr MakeResponseStruct(const TestResponse& data) {
+  HttpResponsePtr response(HttpResponse::New());
   response->status_code = data.status_code;
   response->headers.resize(data.headers.size());
   size_t index = 0;
   for (const auto& item : data.headers) {
-    HTTPHeaderPtr header(HTTPHeader::New());
+    HttpHeaderPtr header(HttpHeader::New());
     header->name = item.first;
     header->value = item.second;
     response->headers[index++] = header.Pass();
@@ -99,7 +99,7 @@ URLResponsePtr MakeResponseStruct(const TestResponse& data) {
 }
 
 void CheckHeaders(const TestHeaders& expected,
-                  const Array<HTTPHeaderPtr>& headers) {
+                  const Array<HttpHeaderPtr>& headers) {
   // The server impl fiddles with Content-Length and Content-Type. So we don't
   // do a strict check here.
   std::map<std::string, std::string> header_map;
@@ -116,17 +116,17 @@ void CheckHeaders(const TestHeaders& expected,
   }
 }
 
-void CheckRequest(const TestRequest& expected, URLRequestPtr request) {
+void CheckRequest(const TestRequest& expected, HttpRequestPtr request) {
   EXPECT_EQ(expected.method, request->method);
   EXPECT_EQ(expected.url, request->url);
   CheckHeaders(expected.headers, request->headers);
   if (expected.body) {
-    EXPECT_EQ(1u, request->body.size());
+    EXPECT_TRUE(request->body.is_valid());
     std::string body;
-    common::BlockingCopyToString(request->body[0].Pass(), &body);
+    common::BlockingCopyToString(request->body.Pass(), &body);
     EXPECT_EQ(*expected.body, body);
   } else {
-    EXPECT_EQ(0u, request->body.size());
+    EXPECT_FALSE(request->body.is_valid());
   }
 }
 
@@ -264,7 +264,7 @@ class TestHttpClient {
 class HttpConnectionDelegateImpl : public HttpConnectionDelegate {
  public:
   struct PendingRequest {
-    URLRequestPtr request;
+    HttpRequestPtr request;
     OnReceivedRequestCallback callback;
   };
 
@@ -277,7 +277,7 @@ class HttpConnectionDelegateImpl : public HttpConnectionDelegate {
   ~HttpConnectionDelegateImpl() override {}
 
   // HttpConnectionDelegate implementation:
-  void OnReceivedRequest(URLRequestPtr request,
+  void OnReceivedRequest(HttpRequestPtr request,
                          const OnReceivedRequestCallback& callback) override {
     linked_ptr<PendingRequest> pending_request(new PendingRequest);
     pending_request->request = request.Pass();
@@ -290,12 +290,12 @@ class HttpConnectionDelegateImpl : public HttpConnectionDelegate {
   }
 
   void OnReceivedWebSocketRequest(
-      URLRequestPtr request,
+      HttpRequestPtr request,
       const OnReceivedWebSocketRequestCallback& callback) override {
     NOTREACHED();
   }
 
-  void SendResponse(URLResponsePtr response) {
+  void SendResponse(HttpResponsePtr response) {
     ASSERT_FALSE(pending_requests_.empty());
     linked_ptr<PendingRequest> request = pending_requests_[0];
     pending_requests_.erase(pending_requests_.begin());

mojo/services/network/public/interfaces/BUILD.gn

@@ -9,6 +9,7 @@ mojom("interfaces") {
   sources = [
     "cookie_store.mojom",
     "http_connection.mojom",
+    "http_message.mojom",
     "http_server.mojom",
     "net_address.mojom",
     "network_error.mojom",

mojo/services/network/public/interfaces/http_connection.mojom

@@ -4,7 +4,7 @@
 
 module mojo;
 
-import "network/public/interfaces/url_loader.mojom";
+import "network/public/interfaces/http_message.mojom";
 import "network/public/interfaces/network_error.mojom";
 import "network/public/interfaces/web_socket.mojom";
 
@@ -18,7 +18,7 @@ interface HttpConnection {
 
 interface HttpConnectionDelegate {
   // Called when an HTTP request is received.
-  OnReceivedRequest(URLRequest request) => (URLResponse response);
+  OnReceivedRequest(HttpRequest request) => (HttpResponse response);
 
   // Called when an WebSocket request is received.
   //
@@ -28,7 +28,7 @@ interface HttpConnectionDelegate {
   // WebSocket should be written to the producer end of the |send_stream|.
   // |web_socket| will be already connected. There is no need to call Connect()
   // on it. But |client| will still receive a DidConnect() notification.
-  OnReceivedWebSocketRequest(URLRequest request)
+  OnReceivedWebSocketRequest(HttpRequest request)
       => (WebSocket&? web_socket,
           handle<data_pipe_consumer>? send_stream,
           WebSocketClient? client);

mojo/services/network/public/interfaces/http_message.mojom

+// Copyright 2015 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.
+
+module mojo;
+
+struct HttpHeader {
+  string name;
+  string value;
+};
+
+struct HttpRequest {
+  string method = "GET";
+  string url;
+  array<HttpHeader>? headers;
+  handle<data_pipe_consumer>? body;
+};
+
+struct HttpResponse {
+  uint32 status_code = 200;
+  array<HttpHeader>? headers;
+  handle<data_pipe_consumer>? body;
+};

mojo/services/network/public/interfaces/url_loader.mojom

@@ -4,13 +4,9 @@
 
 module mojo;
 
+import "network/public/interfaces/http_message.mojom";
 import "network/public/interfaces/network_error.mojom";
 
-struct HTTPHeader {
-  string name;
-  string value;
-};
-
 struct URLRequest {
   // The URL to load.
   string url;
@@ -19,7 +15,7 @@ struct URLRequest {
   string method = "GET";
 
   // Additional HTTP request headers.
-  array<HTTPHeader>? headers;
+  array<HttpHeader>? headers;
 
   // The payload for the request body, represented as a concatenation of data
   // streams. For HTTP requests, the method must be set to "POST" or "PUT".
@@ -59,7 +55,7 @@ struct URLResponse {
   string? status_line;
 
   // The HTTP response headers.
-  array<HTTPHeader>? headers;
+  array<HttpHeader>? headers;
 
   // The MIME type of the response body.
   string? mime_type;

mojo/services/network/url_loader_impl.cc

@@ -31,12 +31,12 @@ URLResponsePtr MakeURLResponse(const net::URLRequest* url_request) {
     response->status_code = headers->response_code();
     response->status_line = headers->GetStatusLine();
 
-    response->headers = Array<HTTPHeaderPtr>::New(0);
+    response->headers = Array<HttpHeaderPtr>::New(0);
     std::vector<String> header_lines;
     void* iter = nullptr;
     std::string name, value;
     while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
-      HTTPHeaderPtr header = HTTPHeader::New();
+      HttpHeaderPtr header = HttpHeader::New();
       header->name = name;
       header->value = value;
       response->headers.push_back(header.Pass());

mojo/shell/local_fetcher.cc

@@ -53,8 +53,8 @@ URLResponsePtr LocalFetcher::AsURLResponse(base::TaskRunner* task_runner,
   response->body = data_pipe.consumer_handle.Pass();
   int64 file_size;
   if (base::GetFileSize(path_, &file_size)) {
-    response->headers = Array<HTTPHeaderPtr>(1);
-    HTTPHeaderPtr header = HTTPHeader::New();
+    response->headers = Array<HttpHeaderPtr>(1);
+    HttpHeaderPtr header = HttpHeader::New();
     header->name = "Content-Length";
     header->value = base::StringPrintf("%" PRId64, file_size);
     response->headers[0] = header.Pass();