Switch to standard integer types in net/.

net/spdy/hpack/hpack_output_stream_test.cc

Index: net/spdy/hpack/hpack_output_stream_test.cc
diff --git a/net/spdy/hpack/hpack_output_stream_test.cc b/net/spdy/hpack/hpack_output_stream_test.cc
index 48b5dcc0593e74a53061474c9c3461f7cb07b0ad..939dd9d8d03bf699d158064d171ba9550274f54a 100644
--- a/net/spdy/hpack/hpack_output_stream_test.cc
+++ b/net/spdy/hpack/hpack_output_stream_test.cc
@@ -6,7 +6,6 @@
 
 #include <cstddef>
 
-#include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -47,7 +46,7 @@ TEST(HpackOutputStreamTest, AppendBits) {
 
 // Utility function to return I as a string encoded with an N-bit
 // prefix.
-string EncodeUint32(uint8 N, uint32 I) {
+string EncodeUint32(uint8_t N, uint32_t I) {
   HpackOutputStream output_stream;
   if (N < 8) {
     output_stream.AppendBits(0x00, 8 - N);