Switch to standard integer types in net/.

net/proxy/proxy_server.cc

Index: net/proxy/proxy_server.cc
diff --git a/net/proxy/proxy_server.cc b/net/proxy/proxy_server.cc
index e451265cbb9700127d3826ce6254c84d163d01f5..d3ba5ba1e677e37ec0fd7c7c51ed4545557a4521 100644
--- a/net/proxy/proxy_server.cc
+++ b/net/proxy/proxy_server.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
@@ -236,7 +235,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(
     if (port == -1)
       port = GetDefaultPortForScheme(scheme);
 
-    host_port_pair = HostPortPair(host, static_cast<uint16>(port));
+    host_port_pair = HostPortPair(host, static_cast<uint16_t>(port));
   }
 
   return ProxyServer(scheme, host_port_pair);