Allow HttpServer response to include custom headers.

Allow HttpServer response to include custom headers.

This is done by introducing a simple HttpServerResponseInfo class, and
changing the root HttpServer::Send to accept it instead of a status, data, and
mime type.
BUG=none

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213227

[kkania, 2013-07-18 15:57:44]

Tested manually with remote debugger and chromedriver also.

Only difference to remote debugger clients should be 404's only include
content-length:0, not content-type:text/html. This works with chrome.

[pfeldman, 2013-07-19 12:47:57]

lgtm

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
File net/server/http_server_response_info.cc (right):

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.cc:20: response.AddHeader("Content-Length",
"0");
Lets use constants from net::HttpRequestHeaders
(net::HttpRequestHeaders::kContentLength)

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.cc:46: "HTTP/1.1 %d %s\r\n", status_code_,
GetHttpReasonPhrase(status_code_));
Extract const

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
File net/server/http_server_response_info.h (right):

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:20: HttpServerResponseInfo(HttpStatusCode
status_code);
explicit

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:22: static HttpServerResponseInfo
For404();
CreateFor404 ?

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:23: static HttpServerResponseInfo
For500(const std::string& message);
CreateFor500 ?

[kkania, 2013-07-19 15:28:36]

mmenke: OWNERS approval

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
File net/server/http_server_response_info.cc (right):

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.cc:20: response.AddHeader("Content-Length",
"0");
On 2013/07/19 12:47:57, pfeldman wrote:
> Lets use constants from net::HttpRequestHeaders
> (net::HttpRequestHeaders::kContentLength)

Done.

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
File net/server/http_server_response_info.h (right):

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:20: HttpServerResponseInfo(HttpStatusCode
status_code);
On 2013/07/19 12:47:57, pfeldman wrote:
> explicit

Done.

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:22: static HttpServerResponseInfo
For404();
On 2013/07/19 12:47:57, pfeldman wrote:
> CreateFor404 ?

Done.

https://codereview.chromium.org/19637005/diff/18001/net/server/http_server_re...
net/server/http_server_response_info.h:23: static HttpServerResponseInfo
For500(const std::string& message);
On 2013/07/19 12:47:57, pfeldman wrote:
> CreateFor500 ?

Done.

[mmenke, 2013-07-19 16:17:44]

LGTM

https://codereview.chromium.org/19637005/diff/25001/net/server/http_server_re...
File net/server/http_server_response_info.cc (right):

https://codereview.chromium.org/19637005/diff/25001/net/server/http_server_re...
net/server/http_server_response_info.cc:23:
response.AddHeader(HttpRequestHeaders::kContentLength, "0");
Maybe SetBody("");?

https://codereview.chromium.org/19637005/diff/25001/net/server/http_server_re...
net/server/http_server_response_info.cc:41: const std::string& content_type) {
Maybe DCHECK(body_.empty());?

https://codereview.chromium.org/19637005/diff/25001/net/server/http_server_re...
File net/server/http_server_response_info.h (right):

https://codereview.chromium.org/19637005/diff/25001/net/server/http_server_re...
net/server/http_server_response_info.h:24: static HttpServerResponseInfo
CreateFor500(const std::string& message);
nit:  This should be "body", not "message".

[commit-bot: I haz the power, 2013-07-22 21:53:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkania@chromium.org/19637005/41001

[commit-bot: I haz the power, 2013-07-22 22:38:07]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...

[commit-bot: I haz the power, 2013-07-22 22:50:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkania@chromium.org/19637005/41001

[commit-bot: I haz the power, 2013-07-22 23:03:17]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win_x64_rel.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_x64_re...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-07-23 00:19:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkania@chromium.org/19637005/65001

[kkania, 2013-07-23 00:46:27]

scottbyer: OWNERS approval for cloud_print

[Scott Byer, 2013-07-23 02:19:13]

LGTM for Cloud Print

[commit-bot: I haz the power, 2013-07-23 17:02:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkania@chromium.org/19637005/82001

[commit-bot: I haz the power, 2013-07-23 17:02:14]

Failed to apply patch for cloud_print/gcp20/prototype/privet_http_server.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file cloud_print/gcp20/prototype/privet_http_server.cc
  Hunk #1 succeeded at 9 (offset 1 line).
  Hunk #2 FAILED at 87.
  1 out of 2 hunks FAILED -- saving rejects to file
cloud_print/gcp20/prototype/privet_http_server.cc.rej

Patch:       cloud_print/gcp20/prototype/privet_http_server.cc
Index: cloud_print/gcp20/prototype/privet_http_server.cc
diff --git a/cloud_print/gcp20/prototype/privet_http_server.cc
b/cloud_print/gcp20/prototype/privet_http_server.cc
index
2114360fd040d8e44fe32a0ce18e1e1586bdd9eb..909e0693055e6c98c60093a317f644d9395bffd0
100644
--- a/cloud_print/gcp20/prototype/privet_http_server.cc
+++ b/cloud_print/gcp20/prototype/privet_http_server.cc
@@ -8,6 +8,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/url_util.h"
+#include "net/server/http_server_response_info.h"
 #include "net/socket/tcp_listen_socket.h"
 #include "url/gurl.h"
 
@@ -86,10 +87,11 @@ void PrivetHttpServer::OnHttpRequest(int connection_id,
   GURL url("http://host" + info.path);
 
   // TODO(maksymb): Add checking for X-PrivetToken.
-  std::string response;
-  net::HttpStatusCode status_code = ProcessHttpRequest(url, &response);
+  std::string body;
+  net::HttpServerResponseInfo response(ProcessHttpRequest(url, &body));
+  response.SetBody(body, "text/plain");
 
-  server_->Send(connection_id, status_code, response, "text/plain");
+  server_->Send(connection_id, response);
 }
 
 void PrivetHttpServer::OnWebSocketRequest(

[commit-bot: I haz the power, 2013-07-23 17:55:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/kkania@chromium.org/19637005/101001

[commit-bot: I haz the power, 2013-07-23 21:29:14]

Change committed as 213227