Switch to standard integer types in net/.

net/tools/flip_server/spdy_interface_test.cc

Index: net/tools/flip_server/spdy_interface_test.cc
diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
index afea0c46115490237bd32f8456b170794055f843..1d4c09ac16e38599f6118221ba92083a78b19fef 100644
--- a/net/tools/flip_server/spdy_interface_test.cc
+++ b/net/tools/flip_server/spdy_interface_test.cc
@@ -76,7 +76,7 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface {
   MOCK_METHOD2(OnHeaderFrameEnd,
                void(SpdyStreamId stream_id, bool end_headers));
   MOCK_METHOD1(OnSettings, void(bool clear_persisted));
-  MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8, uint32));
+  MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8_t, uint32_t));
   MOCK_METHOD2(OnPing, void(SpdyPingId unique_id, bool is_ack));
   MOCK_METHOD2(OnRstStream, void(SpdyStreamId, SpdyRstStreamStatus));
   MOCK_METHOD3(OnGoAway, void(SpdyStreamId, SpdyGoAwayStatus, StringPiece));
@@ -189,7 +189,7 @@ class SpdySMTestBase : public ::testing::TestWithParam<SpdyMajorVersion> {
     output_list.clear();
   }
 
-  bool HasStream(uint32 stream_id) {
+  bool HasStream(uint32_t stream_id) {
     return interface_->output_ordering().ExistsInPriorityMaps(stream_id);
   }
 
@@ -231,8 +231,8 @@ TEST_P(SpdySMProxyTest, InitSMConnection) {
 TEST_P(SpdySMProxyTest, OnStreamFrameData) {
   BufferedSpdyFramerVisitorInterface* visitor = interface_.get();
   scoped_ptr<MockSMInterface> mock_interface(new MockSMInterface);
-  uint32 stream_id = 92;
-  uint32 associated_id = 43;
+  uint32_t stream_id = 92;
+  uint32_t associated_id = 43;
   SpdyHeaderBlock block;
   testing::MockFunction<void(int)> checkpoint;  // NOLINT
 
@@ -261,7 +261,7 @@ TEST_P(SpdySMProxyTest, OnStreamFrameData) {
 
 TEST_P(SpdySMProxyTest, OnRstStream) {
   BufferedSpdyFramerVisitorInterface* visitor = interface_.get();
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   MemCacheIter mci;
   mci.stream_id = stream_id;
 
@@ -287,7 +287,7 @@ TEST_P(SpdySMProxyTest, ProcessReadInput) {
 }
 
 TEST_P(SpdySMProxyTest, ResetForNewConnection) {
-  uint32 stream_id = 13;
+  uint32_t stream_id = 13;
   MemCacheIter mci;
   mci.stream_id = stream_id;
   // incomplete input
@@ -346,7 +346,7 @@ TEST_P(SpdySMProxyTest, NewStream) {
 }
 
 TEST_P(SpdySMProxyTest, AddToOutputOrder) {
-  uint32 stream_id = 13;
+  uint32_t stream_id = 13;
   MemCacheIter mci;
   mci.stream_id = stream_id;
 
@@ -362,7 +362,7 @@ TEST_P(SpdySMProxyTest, AddToOutputOrder) {
 }
 
 TEST_P(SpdySMProxyTest, SendErrorNotFound) {
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   SpdyHeaderBlock actual_header_block;
   const char* actual_data;
   size_t actual_size;
@@ -410,7 +410,7 @@ TEST_P(SpdySMProxyTest, SendErrorNotFound) {
 }
 
 TEST_P(SpdySMProxyTest, SendSynStream) {
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   BalsaHeaders headers;
   SpdyHeaderBlock actual_header_block;
   headers.AppendHeader("key1", "value1");
@@ -441,7 +441,7 @@ TEST_P(SpdySMProxyTest, SendSynStream) {
 }
 
 TEST_P(SpdySMProxyTest, SendSynReply) {
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   BalsaHeaders headers;
   SpdyHeaderBlock actual_header_block;
   headers.AppendHeader("key1", "value1");
@@ -475,7 +475,7 @@ TEST_P(SpdySMProxyTest, SendSynReply) {
 }
 
 TEST_P(SpdySMProxyTest, SendDataFrame) {
-  uint32 stream_id = 133;
+  uint32_t stream_id = 133;
   SpdyDataFlags flags = DATA_FLAG_NONE;
   const char* actual_data;
   size_t actual_size;
@@ -501,7 +501,7 @@ TEST_P(SpdySMProxyTest, SendDataFrame) {
 }
 
 TEST_P(SpdySMProxyTest, SendLongDataFrame) {
-  uint32 stream_id = 133;
+  uint32_t stream_id = 133;
   SpdyDataFlags flags = DATA_FLAG_NONE;
   const char* actual_data;
   size_t actual_size;
@@ -541,7 +541,7 @@ TEST_P(SpdySMProxyTest, SendLongDataFrame) {
 
 TEST_P(SpdySMServerTest, OnSynStream) {
   BufferedSpdyFramerVisitorInterface* visitor = interface_.get();
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   SpdyHeaderBlock spdy_headers;
   spdy_headers["url"] = "http://www.example.com/path";
   spdy_headers["method"] = "GET";
@@ -557,7 +557,7 @@ TEST_P(SpdySMServerTest, OnSynStream) {
 }
 
 TEST_P(SpdySMServerTest, NewStream) {
-  uint32 stream_id = 13;
+  uint32_t stream_id = 13;
   std::string filename = "foobar";
 
   {
@@ -570,7 +570,7 @@ TEST_P(SpdySMServerTest, NewStream) {
 }
 
 TEST_P(SpdySMServerTest, NewStreamError) {
-  uint32 stream_id = 82;
+  uint32_t stream_id = 82;
   SpdyHeaderBlock actual_header_block;
   const char* actual_data;
   size_t actual_size;