Switch to standard integer types in net/.

net/proxy/proxy_config_service_android.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 "net/proxy/proxy_config_service_android.h"
 
 #include <sys/system_properties.h>
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "jni/ProxyChangeListener_jni.h"
 #include "net/base/host_port_pair.h"
 #include "net/proxy/proxy_config.h"
 #include "url/third_party/mozilla/url_parse.h"
@@ skipping 25 matching lines @@
                                  const std::string& proxy_host,
                                  const std::string& proxy_port) {
   DCHECK(!proxy_host.empty());
   int port_as_int = 0;
   if (proxy_port.empty())
     port_as_int = ProxyServer::GetDefaultPortForScheme(scheme);
   else if (!ConvertStringToPort(proxy_port, &port_as_int))
     return ProxyServer();
   DCHECK(port_as_int > 0);
   return ProxyServer(
-      scheme,
-      HostPortPair(proxy_host, static_cast<uint16>(port_as_int)));
+      scheme, HostPortPair(proxy_host, static_cast<uint16_t>(port_as_int)));
 }
 
 ProxyServer LookupProxy(const std::string& prefix,
                         const GetPropertyCallback& get_property,
                         ProxyServer::Scheme scheme) {
   DCHECK(!prefix.empty());
   std::string proxy_host = get_property.Run(prefix + ".proxyHost");
   if (!proxy_host.empty()) {
     std::string proxy_port = get_property.Run(prefix + ".proxyPort");
     return ConstructProxyServer(scheme, proxy_host, proxy_port);
@@ skipping 331 matching lines @@
         network_task_runner, jni_task_runner, get_property_callback)) {
   delegate_->SetupJNI();
   delegate_->FetchInitialConfig();
 }
 
 void ProxyConfigServiceAndroid::ProxySettingsChanged() {
   delegate_->ProxySettingsChanged();
 }
 
 } // namespace net