Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/proxy_cros_settings_parser.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/browser/chromeos/proxy_cros_settings_parser.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/ui_proxy_config.h"
 #include "chrome/browser/chromeos/ui_proxy_config_service.h"
 
 namespace chromeos {
 
 // Common prefix of all proxy prefs.
 const char kProxyPrefsPrefix[] = "cros.session.proxy";
 
@@ skipping 44 matching lines @@
          NULL;
 }
 
 base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
   return proxy.server.is_valid()
              ? new base::FundamentalValue(proxy.server.host_port_pair().port())
              : NULL;
 }
 
 net::ProxyServer CreateProxyServer(std::string host,
-                                   uint16 port,
+                                   uint16_t port,
                                    net::ProxyServer::Scheme scheme) {
   if (host.empty() && port == 0)
     return net::ProxyServer();
-  uint16 default_port = net::ProxyServer::GetDefaultPortForScheme(scheme);
+  uint16_t default_port = net::ProxyServer::GetDefaultPortForScheme(scheme);
   net::HostPortPair host_port_pair;
   // Check if host is a valid URL or a string of valid format <server>::<port>.
   GURL url(host);
   if (url.is_valid())  // See if host is URL.
     host_port_pair = net::HostPortPair::FromURL(url);
   if (host_port_pair.host().empty())  // See if host is <server>::<port>.
     host_port_pair = net::HostPortPair::FromString(host);
   if (host_port_pair.host().empty())  // Host is not URL or <server>::<port>.
     host_port_pair = net::HostPortPair(host, port);
   if (host_port_pair.port() == 0)  // No port in host, use default.
     host_port_pair.set_port(default_port);
   return net::ProxyServer(scheme, host_port_pair);
 }
 
 net::ProxyServer CreateProxyServerFromHost(
     const std::string& host,
     const UIProxyConfig::ManualProxy& proxy,
     net::ProxyServer::Scheme scheme) {
-  uint16 port = 0;
+  uint16_t port = 0;
   if (proxy.server.is_valid())
     port = proxy.server.host_port_pair().port();
   return CreateProxyServer(host, port, scheme);
 }
 
 net::ProxyServer CreateProxyServerFromPort(
-    uint16 port,
+    uint16_t port,
     const UIProxyConfig::ManualProxy& proxy,
     net::ProxyServer::Scheme scheme) {
   std::string host;
   if (proxy.server.is_valid())
     host = proxy.server.host_port_pair().host();
   return CreateProxyServer(host, port, scheme);
 }
 
 }  // namespace
 
@@ skipping 262 matching lines @@
   } else {
     dict->SetBoolean("disabled", false);
   }
   *out_value = dict;
   return true;
 }
 
 }  // namespace proxy_cros_settings_parser
 
 }  // namespace chromeos