SSL in EmbeddedTestServer

net/test/embedded_test_server/http_response.h

Index: net/test/embedded_test_server/http_response.h
diff --git a/net/test/embedded_test_server/http_response.h b/net/test/embedded_test_server/http_response.h
index d4df75b5b85418960e39b54056b1562dfe4c4d39..1b58d8abcda3a445781fd3eac0c0ddeb6d07ccf2 100644
--- a/net/test/embedded_test_server/http_response.h
+++ b/net/test/embedded_test_server/http_response.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_split.h"
 #include "net/http/http_status_code.h"
@@ -16,15 +17,22 @@
 namespace net {
 namespace test_server {
 
+// Callback called when the response is done being sent.
+typedef base::Callback<void(void)> SendDoneCallback;

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

Nit: using SendDoneCallback = base::Callback<void(void)>; for new code

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

Done.

+
+// Callback called when the response is ready to be sent.
+typedef base::Callback<void(std::string response, SendDoneCallback done)>
+    SendCallback;
+
 // Interface for HTTP response implementations.
 class HttpResponse{
  public:
   virtual ~HttpResponse();
 
-  // Returns raw contents to be written to the network socket
+  // Calls |send| with the raw contents to be written to the network socket
   // in response. If you intend to make this a valid HTTP response,
   // it should start with "HTTP/x.x" line, followed by response headers.

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

Should add "May call |send| reentrantly." or something. Perhaps also add "If the
HttpResponse is destroyed before the operation completes, the callback will not
be called."

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

Done.

-  virtual std::string ToResponseString() const = 0;
+  virtual void SendResponse(SendCallback send, SendDoneCallback done) = 0;

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

Why do you need both callbacks? It looks like SendDoneCallback is only ever
passed into SendCallback, right? So you could just bind it when calling
SendResponse.

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

Nit: I'd probably call this GetResponse or something about putting the response
to a string. As far as the HttpResponse is concerned, it's just asynchronously
providing a string. It's the EmbeddedTestServer and stuff that decides to send
it.

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

I guess that's kind of true in the base case, however we also want to support
cases where SendResponse is the thing setting up and running the send task.

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

Some subclasses (not implemented yet) will need to be able to do SendCallback
multiple times, without SendDoneCallback being called until the final one.
Notably chunking will need this.

 };
 
 // This class is used to handle basic HTTP responses with commonly used
@@ -54,7 +62,9 @@ class BasicHttpResponse : public HttpResponse {
   }
 
   // Generates and returns a http response string.
-  std::string ToResponseString() const override;
+  std::string ToResponseString() const;
+
+  void SendResponse(SendCallback send, SendDoneCallback done) override;
 
  private:
   HttpStatusCode code_;