Use uint16 for port numbers more pervasively.

chrome/test/chromedriver/net/websocket.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 "chrome/test/chromedriver/net/websocket.h"
 
 #include <string.h>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 60 matching lines @@
   CHECK(thread_checker_.CalledOnValidThread());
   CHECK_EQ(INITIALIZED, state_);
 
   net::IPAddressNumber address;
   if (!net::ParseIPLiteralToNumber(url_.HostNoBrackets(), &address)) {
     if (!ResolveHost(url_.HostNoBrackets(), &address)) {
       callback.Run(net::ERR_ADDRESS_UNREACHABLE);
       return;
     }
   }
-  int port = 80;
-  base::StringToInt(url_.port(), &port);
-  net::AddressList addresses(net::IPEndPoint(address, port));
+  net::AddressList addresses(
+      net::IPEndPoint(address, static_cast<uint16>(url_.EffectiveIntPort())));
   net::NetLog::Source source;
   socket_.reset(new net::TCPClientSocket(addresses, NULL, source));
 
   state_ = CONNECTING;
   connect_callback_ = callback;
   int code = socket_->Connect(base::Bind(
       &WebSocket::OnSocketConnect, base::Unretained(this)));
   if (code != net::ERR_IO_PENDING)
     OnSocketConnect(code);
 }
@@ skipping 161 matching lines @@
 
 void WebSocket::Close(int code) {
   socket_->Disconnect();
   if (!connect_callback_.is_null())
     InvokeConnectCallback(code);
   if (state_ == OPEN)
     listener_->OnClose();
 
   state_ = CLOSED;
 }