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, 12 insertions, 6 deletions

diff --git a/net/server/web_socket.cc b/net/server/web_socket.cc
index e2829da..398e4e0 100644
--- a/net/server/web_socket.cc
+++ b/net/server/web_socket.cc
@@ -115,14 +115,18 @@ class WebSocketHixie76 : public net::WebSocket {
     std::string key2 = request.GetHeaderValue("Sec-WebSocket-Key2");
 
     if (key1.empty()) {
-      connection->Send500("Invalid request format. "
-                          "Sec-WebSocket-Key1 is empty or isn't specified.");
+      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
+                       "Invalid request format. "
+                           "Sec-WebSocket-Key1 is empty or isn't specified.",
+                       "text/html");
       return;
     }
 
     if (key2.empty()) {
-      connection->Send500("Invalid request format. "
-                          "Sec-WebSocket-Key2 is empty or isn't specified.");
+      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
+                       "Invalid request format. "
+                           "Sec-WebSocket-Key2 is empty or isn't specified.",
+                       "text/html");
       return;
     }
 
@@ -175,8 +179,10 @@ class WebSocketHybi17 : public WebSocket {
 
     std::string key = request.GetHeaderValue("Sec-WebSocket-Key");
     if (key.empty()) {
-      connection->Send500("Invalid request format. "
-              "Sec-WebSocket-Key is empty or isn't specified.");
+      connection->Send(net::HTTP_INTERNAL_SERVER_ERROR,
+                       "Invalid request format. "
+                           "Sec-WebSocket-Key is empty or isn't specified.",
+                       "text/html");
       return NULL;
     }
     return new WebSocketHybi17(connection, request, pos);