DevTools: add /json/activate/ command to the discovery protocol.

This change adds suppot for /activate command and refactors the json commands handling so that all commands supported jsonp properly. For the jsonp support, we always respond with 200 OK and specify the actual code in the jsonp call parameter. 

For the above purposes, migrates net/server/http_server from Send404() scheme to Send(net::HTTP_NOT_FOUND).

BUG=157495


Review URL: https://chromiumcodereview.appspot.com/11499004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172285 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 2 deletions

diff --git a/net/server/http_server.h b/net/server/http_server.h
index bc6a290..54773ad 100644
--- a/net/server/http_server.h
+++ b/net/server/http_server.h
@@ -11,6 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/stream_listen_socket.h"
+#include "net/http/http_status_code.h"
 
 namespace net {
 
@@ -45,13 +46,16 @@ class HttpServer : public StreamListenSocket::Delegate,
   void AcceptWebSocket(int connection_id,
                        const HttpServerRequestInfo& request);
   void SendOverWebSocket(int connection_id, const std::string& data);
-  void Send(int connection_id, const std::string& data);
-  void Send(int connection_id, const char* bytes, int len);
+  void Send(int connection_id,
+            HttpStatusCode status_code,
+            const std::string& data,
+            const std::string& mime_type);
   void Send200(int connection_id,
                const std::string& data,
                const std::string& mime_type);
   void Send404(int connection_id);
   void Send500(int connection_id, const std::string& message);
+
   void Close(int connection_id);
 
   // Copies the local address to |address|. Returns a network error code.