Use uint16 for port numbers more pervasively.

chromecast/browser/devtools/remote_debugging_server.cc

 // Copyright 2014 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 "chromecast/browser/devtools/remote_debugging_server.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 13 matching lines @@
 #include "net/socket/unix_domain_server_socket_posix.h"
 #endif  // defined(OS_ANDROID)
 
 namespace chromecast {
 namespace shell {
 
 namespace {
 
 const char kFrontEndURL[] =
     "https://chrome-devtools-frontend.appspot.com/serve_rev/%s/inspector.html";
-const int kDefaultRemoteDebuggingPort = 9222;
+const uint16 kDefaultRemoteDebuggingPort = 9222;
 
 #if defined(OS_ANDROID)
 class UnixDomainServerSocketFactory
     : public content::DevToolsHttpHandler::ServerSocketFactory {
  public:
   explicit UnixDomainServerSocketFactory(const std::string& socket_name)
       : content::DevToolsHttpHandler::ServerSocketFactory(socket_name, 0, 1) {}
 
  private:
   // content::DevToolsHttpHandler::ServerSocketFactory.
   virtual scoped_ptr<net::ServerSocket> Create() const override {
     return scoped_ptr<net::ServerSocket>(
         new net::UnixDomainServerSocket(
             base::Bind(&content::CanUserConnectToDevTools),
             true /* use_abstract_namespace */));
   }
 
   DISALLOW_COPY_AND_ASSIGN(UnixDomainServerSocketFactory);
 };
 #else
 class TCPServerSocketFactory
     : public content::DevToolsHttpHandler::ServerSocketFactory {
  public:
-  TCPServerSocketFactory(const std::string& address, int port, int backlog)
+  TCPServerSocketFactory(const std::string& address, uint16 port, int backlog)
       : content::DevToolsHttpHandler::ServerSocketFactory(
             address, port, backlog) {}
 
  private:
   // content::DevToolsHttpHandler::ServerSocketFactory.
   virtual scoped_ptr<net::ServerSocket> Create() const override {
     return scoped_ptr<net::ServerSocket>(
         new net::TCPServerSocket(NULL, net::NetLog::Source()));
   }
 
   DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
 };
 #endif
 
 scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>
-CreateSocketFactory(int port) {
+CreateSocketFactory(uint16 port) {
 #if defined(OS_ANDROID)
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   std::string socket_name = "cast_shell_devtools_remote";
   if (command_line->HasSwitch(switches::kRemoteDebuggingSocketName)) {
     socket_name = command_line->GetSwitchValueASCII(
         switches::kRemoteDebuggingSocketName);
   }
   return scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>(
       new UnixDomainServerSocketFactory(socket_name));
 #else
@@ skipping 21 matching lines @@
                       kDefaultRemoteDebuggingPort : 0);
   OnPortChanged();
 }
 
 RemoteDebuggingServer::~RemoteDebuggingServer() {
   pref_port_.SetValue(0);
   OnPortChanged();
 }
 
 void RemoteDebuggingServer::OnPortChanged() {
-  int new_port = *pref_port_;
-  if (new_port < 0) {
-    new_port = 0;
-  }
+  uint16 new_port = static_cast<uint16>(std::max(*pref_port_, 0));
   VLOG(1) << "OnPortChanged called: old_port=" << port_
           << ", new_port=" << new_port;
 
   if (new_port == port_) {
     VLOG(1) << "Port has not been changed. Ignore silently.";
     return;
   }
 
   if (devtools_http_handler_) {
     LOG(INFO) << "Stop old devtools: port=" << port_;
     devtools_http_handler_.reset();
   }
 
   port_ = new_port;
   if (port_ > 0) {
     devtools_http_handler_.reset(content::DevToolsHttpHandler::Start(
         CreateSocketFactory(port_),
         GetFrontendUrl(),
         new CastDevToolsDelegate(),
         base::FilePath()));
     LOG(INFO) << "Devtools started: port=" << port_;
   }
 }
 
 }  // namespace shell
 }  // namespace chromecast