Switch to standard integer types in net/.

net/tools/flip_server/flip_test_utils.h

Index: net/tools/flip_server/flip_test_utils.h
diff --git a/net/tools/flip_server/flip_test_utils.h b/net/tools/flip_server/flip_test_utils.h
index 0a61a60f771b36e7b86662e1d5a391fb7ada800c..a4eab1bb7c09338bca48e6cc6e297a71ceebda3d 100644
--- a/net/tools/flip_server/flip_test_utils.h
+++ b/net/tools/flip_server/flip_test_utils.h
@@ -5,6 +5,9 @@
 #ifndef NET_TOOLS_FLIP_SERVER_FLIP_TEST_UTILS_H_
 #define NET_TOOLS_FLIP_SERVER_FLIP_TEST_UTILS_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 
 #include "net/tools/flip_server/sm_interface.h"
@@ -18,7 +21,7 @@ class MockSMInterface : public SMInterface {
   MockSMInterface();
   virtual ~MockSMInterface();
 
-  MOCK_METHOD2(InitSMInterface, void(SMInterface*, int32));
+  MOCK_METHOD2(InitSMInterface, void(SMInterface*, int32_t));
   MOCK_METHOD8(InitSMConnection,
                void(SMConnectionPoolInterface*,
                     SMInterface*,
@@ -30,21 +33,22 @@ class MockSMInterface : public SMInterface {
                     bool));
   MOCK_METHOD2(ProcessReadInput, size_t(const char*, size_t));
   MOCK_METHOD2(ProcessWriteInput, size_t(const char*, size_t));
-  MOCK_METHOD1(SetStreamID, void(uint32 stream_id));
+  MOCK_METHOD1(SetStreamID, void(uint32_t stream_id));
   MOCK_CONST_METHOD0(MessageFullyRead, bool());
   MOCK_CONST_METHOD0(Error, bool());
   MOCK_CONST_METHOD0(ErrorAsString, const char*());
   MOCK_METHOD0(Reset, void());
-  MOCK_METHOD1(ResetForNewInterface, void(int32 server_idx));
+  MOCK_METHOD1(ResetForNewInterface, void(int32_t server_idx));
   MOCK_METHOD0(ResetForNewConnection, void());
   MOCK_METHOD0(Cleanup, void());
   MOCK_METHOD0(PostAcceptHook, int());
-  MOCK_METHOD3(NewStream, void(uint32, uint32, const std::string&));
-  MOCK_METHOD1(SendEOF, void(uint32 stream_id));
-  MOCK_METHOD1(SendErrorNotFound, void(uint32 stream_id));
-  MOCK_METHOD2(SendSynStream, size_t(uint32, const BalsaHeaders&));
-  MOCK_METHOD2(SendSynReply, size_t(uint32, const BalsaHeaders&));
-  MOCK_METHOD5(SendDataFrame, void(uint32, const char*, int64, uint32, bool));
+  MOCK_METHOD3(NewStream, void(uint32_t, uint32_t, const std::string&));
+  MOCK_METHOD1(SendEOF, void(uint32_t stream_id));
+  MOCK_METHOD1(SendErrorNotFound, void(uint32_t stream_id));
+  MOCK_METHOD2(SendSynStream, size_t(uint32_t, const BalsaHeaders&));
+  MOCK_METHOD2(SendSynReply, size_t(uint32_t, const BalsaHeaders&));
+  MOCK_METHOD5(SendDataFrame,
+               void(uint32_t, const char*, int64_t, uint32_t, bool));
   MOCK_METHOD0(GetOutput, void());
   MOCK_METHOD0(set_is_request, void());
 };