Switch to standard integer types in net/.

net/spdy/hpack/hpack_output_stream_test.cc

 // Copyright 2014 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/spdy/hpack/hpack_output_stream.h"
 
 #include <cstddef>
 
-#include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 using std::string;
 
 // Make sure that AppendBits() appends bits starting from the most
 // significant bit, and that it can handle crossing a byte boundary.
@@ skipping 20 matching lines @@
 
   output_stream.AppendBits(0x0, 7);
 
   string str;
   output_stream.TakeString(&str);
   EXPECT_EQ(expected_str, str);
 }
 
 // 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);
   }
   output_stream.AppendUint32(I);
   string str;
   output_stream.TakeString(&str);
   return str;
 }
 
@@ skipping 190 matching lines @@
   output_stream.AppendBytes("buffer2");
 
   string str;
   output_stream.TakeString(&str);
   EXPECT_EQ("buffer1buffer2", str);
 }
 
 }  // namespace
 
 }  // namespace net