SSL in EmbeddedTestServer

net/test/embedded_test_server/http_response.cc

Index: net/test/embedded_test_server/http_response.cc
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc
index 04155b5ffa529781480646dfa57f8a39caea081b..40e2c72a405919376c6323e9b5f6e25e9b166c72 100644
--- a/net/test/embedded_test_server/http_response.cc
+++ b/net/test/embedded_test_server/http_response.cc
@@ -33,12 +33,13 @@ std::string BasicHttpResponse::ToResponseString() const {
                       code_,
                       http_reason_phrase.c_str());
   base::StringAppendF(&response_builder, "Connection: close\r\n");
-  base::StringAppendF(&response_builder,
-                      "Content-Length: %" PRIuS "\r\n",
-                      content_.size());
-  base::StringAppendF(&response_builder,
-                      "Content-Type: %s\r\n",
-                      content_type_.c_str());
+
+  if (content_type_.size() != 0 || content_.size() != 0) {

[davidben, 2015/10/13 19:43:48]

This is to avoid sending empty headers in some cases I'm guessing? Do our
existing tests do this or was there some other reason? (Commit message doesn't
say anything about this.)

[svaldez, 2015/10/13 20:54:44]

This is for cases where we don't actually have a body (HEAD) and the tests
expect that we don't return a Content-Length.

+    base::StringAppendF(&response_builder, "Content-Length: %" PRIuS "\r\n",
+                        content_.size());
+    base::StringAppendF(&response_builder, "Content-Type: %s\r\n",
+                        content_type_.c_str());
+  }
   for (size_t i = 0; i < custom_headers_.size(); ++i) {
     const std::string& header_name = custom_headers_[i].first;
     const std::string& header_value = custom_headers_[i].second;
@@ -54,5 +55,9 @@ std::string BasicHttpResponse::ToResponseString() const {
   return response_builder + content_;
 }
 
+void BasicHttpResponse::SendResponse(SendCallback send, SendDoneCallback done) {
+  send.Run(ToResponseString(), done);
+}
+
 }  // namespace test_server
 }  // namespace net