[DevTools] Explicitly add Tethering domain to browser protocol.

content/browser/devtools/tethering_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/tethering_handler.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "content/browser/devtools/devtools_http_handler_impl.h"
+#include "content/browser/devtools/devtools_protocol_constants.h"
 #include "content/public/browser/devtools_http_handler_delegate.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/socket/stream_listen_socket.h"
 #include "net/socket/stream_socket.h"
 #include "net/socket/tcp_server_socket.h"
 
 namespace content {
 
 namespace {
 
-const char kTetheringBind[] = "Tethering.bind";
-const char kTetheringUnbind[] = "Tethering.unbind";
-
-const char kTetheringAccepted[] = "Tethering.accepted";
-
-const char kPortParam[] = "port";
-const char kConnectionIdParam[] = "connectionId";
-
 const char kLocalhost[] = "127.0.0.1";
 
 const int kListenBacklog = 5;
 const int kBufferSize = 16 * 1024;
 
 const int kMinTetheringPort = 1024;
 const int kMaxTetheringPort = 32767;
 
 class SocketPump : public net::StreamListenSocket::Delegate {
  public:
@@ skipping 120 matching lines @@
   scoped_ptr<net::StreamListenSocket> accepted_socket_;
   scoped_refptr<net::IOBuffer> buffer_;
   scoped_refptr<net::GrowableIOBuffer> wire_buffer_;
   DevToolsHttpHandlerDelegate* delegate_;
   int wire_buffer_size_;
   bool pending_destruction_;
 };
 
 }  // namespace
 
-const char TetheringHandler::kDomain[] = "Tethering";
-
 class TetheringHandler::BoundSocket {
  public:
   BoundSocket(TetheringHandler* handler,
               DevToolsHttpHandlerDelegate* delegate)
       : handler_(handler),
         delegate_(delegate),
         socket_(new net::TCPServerSocket(NULL, net::NetLog::Source())),
         port_(0) {
   }
 
@@ skipping 53 matching lines @@
 
   TetheringHandler* handler_;
   DevToolsHttpHandlerDelegate* delegate_;
   scoped_ptr<net::ServerSocket> socket_;
   scoped_ptr<net::StreamSocket> accept_socket_;
   int port_;
 };
 
 TetheringHandler::TetheringHandler(DevToolsHttpHandlerDelegate* delegate)
     : delegate_(delegate) {
-  RegisterCommandHandler(kTetheringBind,
+  RegisterCommandHandler(devtools::Tethering::bind::kName,
                          base::Bind(&TetheringHandler::OnBind,
                                     base::Unretained(this)));
-  RegisterCommandHandler(kTetheringUnbind,
+  RegisterCommandHandler(devtools::Tethering::unbind::kName,
                          base::Bind(&TetheringHandler::OnUnbind,
                                     base::Unretained(this)));
 }
 
 TetheringHandler::~TetheringHandler() {
   STLDeleteContainerPairSecondPointers(bound_sockets_.begin(),
                                        bound_sockets_.end());
 }
 
 void TetheringHandler::Accepted(int port, const std::string& name) {
   base::DictionaryValue* params = new base::DictionaryValue();
-  params->SetInteger(kPortParam, port);
-  params->SetString(kConnectionIdParam, name);
-  SendNotification(kTetheringAccepted, params);
+  params->SetInteger(devtools::Tethering::accepted::kParamPort, port);
+  params->SetString(devtools::Tethering::accepted::kParamConnectionId, name);
+  SendNotification(devtools::Tethering::accepted::kName, params);
 }
 
-static int GetPort(scoped_refptr<DevToolsProtocol::Command> command) {
+static int GetPort(scoped_refptr<DevToolsProtocol::Command> command,
+                   const std::string& paramName) {
   base::DictionaryValue* params = command->params();
   int port = 0;
-  if (!params || !params->GetInteger(kPortParam, &port) ||
+  if (!params ||
+      !params->GetInteger(paramName, &port) ||
       port < kMinTetheringPort || port > kMaxTetheringPort)
     return 0;
   return port;
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 TetheringHandler::OnBind(scoped_refptr<DevToolsProtocol::Command> command) {
-  int port = GetPort(command);
+  const std::string& portParamName = devtools::Tethering::bind::kParamPort;
+  int port = GetPort(command, portParamName);
   if (port == 0)
-    return command->InvalidParamResponse(kPortParam);
+    return command->InvalidParamResponse(portParamName);
 
   if (bound_sockets_.find(port) != bound_sockets_.end())
     return command->InternalErrorResponse("Port already bound");
 
   scoped_ptr<BoundSocket> bound_socket(new BoundSocket(this, delegate_));
   if (!bound_socket->Listen(port))
     return command->InternalErrorResponse("Could not bind port");
 
   bound_sockets_[port] = bound_socket.release();
   return command->SuccessResponse(NULL);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 TetheringHandler::OnUnbind(scoped_refptr<DevToolsProtocol::Command> command) {
-  int port = GetPort(command);
+  const std::string& portParamName = devtools::Tethering::unbind::kParamPort;
+  int port = GetPort(command, portParamName);
   if (port == 0)
-    return command->InvalidParamResponse(kPortParam);
+    return command->InvalidParamResponse(portParamName);
 
   BoundSockets::iterator it = bound_sockets_.find(port);
   if (it == bound_sockets_.end())
     return command->InternalErrorResponse("Port is not bound");
 
   delete it->second;
   bound_sockets_.erase(it);
   return command->SuccessResponse(NULL);
 }
 
 }  // namespace content