Switch to standard integer types in net/.

net/tools/quic/quic_server_session_test.cc

 // Copyright 2013 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/tools/quic/quic_server_session.h"
 
+#include "base/macros.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/proto/cached_network_parameters.pb.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_config_peer.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
@@ skipping 321 matching lines @@
   // and we don't have any other data to write.
 
   // Client has sent kBWRE connection option to trigger bandwidth resumption.
   QuicTagVector copt;
   copt.push_back(kBWRE);
   QuicConfigPeer::SetReceivedConnectionOptions(session_->config(), copt);
   session_->OnConfigNegotiated();
   EXPECT_TRUE(
       QuicServerSessionPeer::IsBandwidthResumptionEnabled(session_.get()));
 
-  int32 bandwidth_estimate_kbytes_per_second = 123;
-  int32 max_bandwidth_estimate_kbytes_per_second = 134;
-  int32 max_bandwidth_estimate_timestamp = 1122334455;
+  int32_t bandwidth_estimate_kbytes_per_second = 123;
+  int32_t max_bandwidth_estimate_kbytes_per_second = 134;
+  int32_t max_bandwidth_estimate_timestamp = 1122334455;
   const string serving_region = "not a real region";
   session_->set_serving_region(serving_region);
 
   MockQuicCryptoServerStream* crypto_stream =
       new MockQuicCryptoServerStream(&crypto_config_, session_.get());
   QuicServerSessionPeer::SetCryptoStream(session_.get(), crypto_stream);
 
   // Set some initial bandwidth values.
   QuicSentPacketManager* sent_packet_manager =
       QuicConnectionPeer::GetSentPacketManager(session_->connection());
@@ skipping 20 matching lines @@
   session_->OnCongestionWindowChange(now);
 
   // Bandwidth estimate has now changed sufficiently but not enough time has
   // passed to send a Server Config Update.
   bandwidth_estimate_kbytes_per_second =
       bandwidth_estimate_kbytes_per_second * 1.6;
   session_->OnCongestionWindowChange(now);
 
   // Bandwidth estimate has now changed sufficiently and enough time has passed,
   // but not enough packets have been sent.
-  int64 srtt_ms =
+  int64_t srtt_ms =
       sent_packet_manager->GetRttStats()->smoothed_rtt().ToMilliseconds();
   now = now.Add(QuicTime::Delta::FromMilliseconds(
       kMinIntervalBetweenServerConfigUpdatesRTTs * srtt_ms));
   session_->OnCongestionWindowChange(now);
 
   // The connection no longer has pending data to be written.
   session_->OnCanWrite();
   EXPECT_FALSE(session_->HasDataToWrite());
   session_->OnCongestionWindowChange(now);
 
@@ skipping 152 matching lines @@
   // Create peer initiated stream should have no problem.
   QuicStreamFrame data2(kClientDataStreamId2, false, 0, StringPiece("HT"));
   session_->OnStreamFrame(data2);
   EXPECT_EQ(2u, session_->GetNumOpenIncomingStreams());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net