Switch to standard integer types in net/.

net/http/http_server_properties.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <tuple>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/mru_cache.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_address_number.h"
 #include "net/base/net_export.h"
 #include "net/quic/quic_bandwidth.h"
 #include "net/quic/quic_server_id.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/spdy_framer.h"  // TODO(willchan): Reconsider this.
 #include "net/spdy/spdy_protocol.h"
@@ skipping 69 matching lines @@
     NextProto next_proto);
 
 // (protocol, host, port) triple as defined in
 // https://tools.ietf.org/id/draft-ietf-httpbis-alt-svc-06.html
 struct NET_EXPORT AlternativeService {
   AlternativeService()
       : protocol(UNINITIALIZED_ALTERNATE_PROTOCOL), host(), port(0) {}
 
   AlternativeService(AlternateProtocol protocol,
                      const std::string& host,
-                     uint16 port)
+                     uint16_t port)
       : protocol(protocol), host(host), port(port) {}
 
   AlternativeService(AlternateProtocol protocol,
                      const HostPortPair& host_port_pair)
       : protocol(protocol),
         host(host_port_pair.host()),
         port(host_port_pair.port()) {}
 
   AlternativeService(const AlternativeService& alternative_service) = default;
   AlternativeService& operator=(const AlternativeService& alternative_service) =
@@ skipping 12 matching lines @@
 
   bool operator<(const AlternativeService& other) const {
     return std::tie(protocol, host, port) <
            std::tie(other.protocol, other.host, other.port);
   }
 
   std::string ToString() const;
 
   AlternateProtocol protocol;
   std::string host;
-  uint16 port;
+  uint16_t port;
 };
 
 struct NET_EXPORT AlternativeServiceInfo {
   AlternativeServiceInfo() : alternative_service(), probability(0.0) {}
 
   AlternativeServiceInfo(const AlternativeService& alternative_service,
                          double probability,
                          base::Time expiration)
       : alternative_service(alternative_service),
         probability(probability),
         expiration(expiration) {}
 
   AlternativeServiceInfo(AlternateProtocol protocol,
                          const std::string& host,
-                         uint16 port,
+                         uint16_t port,
                          double probability,
                          base::Time expiration)
       : alternative_service(protocol, host, port),
         probability(probability),
         expiration(expiration) {}
 
   AlternativeServiceInfo(
       const AlternativeServiceInfo& alternative_service_info) = default;
   AlternativeServiceInfo& operator=(
       const AlternativeServiceInfo& alternative_service_info) = default;
@@ skipping 172 matching lines @@
   // Gets a reference to the SettingsMap stored for a host.
   // If no settings are stored, returns an empty SettingsMap.
   virtual const SettingsMap& GetSpdySettings(
       const HostPortPair& host_port_pair) = 0;
 
   // Saves an individual SPDY setting for a host. Returns true if SPDY setting
   // is to be persisted.
   virtual bool SetSpdySetting(const HostPortPair& host_port_pair,
                               SpdySettingsIds id,
                               SpdySettingsFlags flags,
-                              uint32 value) = 0;
+                              uint32_t value) = 0;
 
   // Clears all SPDY settings for a host.
   virtual void ClearSpdySettings(const HostPortPair& host_port_pair) = 0;
 
   // Clears all SPDY settings for all hosts.
   virtual void ClearAllSpdySettings() = 0;
 
   // Returns all persistent SPDY settings.
   virtual const SpdySettingsMap& spdy_settings_map() const = 0;
 
@@ skipping 23 matching lines @@
   // Returns all persistent QuicServerInfo objects.
   virtual const QuicServerInfoMap& quic_server_info_map() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_