Switch to standard integer types in net/.

net/http/http_stream_factory.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/http/http_stream_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 41 matching lines @@
         AlternateProtocolFromString(alternative_service_entry.protocol_id);
     if (!IsAlternateProtocolValid(protocol) ||
         !session.IsProtocolEnabled(protocol) ||
         !IsPortValid(alternative_service_entry.port)) {
       continue;
     }
     // Check if QUIC version is supported.
     if (protocol == QUIC && !alternative_service_entry.version.empty()) {
       bool match_found = false;
       for (QuicVersion supported : session.params().quic_supported_versions) {
-        for (uint16 advertised : alternative_service_entry.version) {
+        for (uint16_t advertised : alternative_service_entry.version) {
           if (supported == advertised) {
             match_found = true;
             break;
           }
         }
         if (match_found) {
           break;
         }
       }
       if (!match_found) {
@@ skipping 72 matching lines @@
     }
   }
 
   if (!is_valid || protocol == UNINITIALIZED_ALTERNATE_PROTOCOL) {
     http_server_properties->ClearAlternativeServices(http_host_port_pair);
     return;
   }
 
   http_server_properties->SetAlternativeService(
       RewriteHost(http_host_port_pair),
-      AlternativeService(protocol, "", static_cast<uint16>(port)), probability,
-      base::Time::Now() + base::TimeDelta::FromDays(30));
+      AlternativeService(protocol, "", static_cast<uint16_t>(port)),
+      probability, base::Time::Now() + base::TimeDelta::FromDays(30));
 }
 
 GURL HttpStreamFactory::ApplyHostMappingRules(const GURL& url,
                                               HostPortPair* endpoint) {
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules && mapping_rules->RewriteHost(endpoint)) {
     url::Replacements<char> replacements;
     const std::string port_str = base::UintToString(endpoint->port());
     replacements.SetPort(port_str.c_str(), url::Component(0, port_str.size()));
     replacements.SetHost(endpoint->host().c_str(),
                          url::Component(0, endpoint->host().size()));
     return url.ReplaceComponents(replacements);
   }
   return url;
 }
 
 HttpStreamFactory::HttpStreamFactory() {}
 
 HostPortPair HttpStreamFactory::RewriteHost(HostPortPair host_port_pair) {
   const HostMappingRules* mapping_rules = GetHostMappingRules();
   if (mapping_rules)
     mapping_rules->RewriteHost(&host_port_pair);
   return host_port_pair;
 }
 
 }  // namespace net