Switch to standard integer types in net/.

net/spdy/hpack/hpack_header_table_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_header_table.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/macros.h"
 #include "net/spdy/hpack/hpack_constants.h"
 #include "net/spdy/hpack/hpack_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 using base::StringPiece;
 using std::distance;
 using std::string;
@@ skipping 45 matching lines @@
 
 namespace {
 
 class HpackHeaderTableTest : public ::testing::Test {
  protected:
   typedef std::vector<HpackEntry> HpackEntryVector;
 
   HpackHeaderTableTest() : table_(), peer_(&table_) {}
 
   // Returns an entry whose Size() is equal to the given one.
-  static HpackEntry MakeEntryOfSize(uint32 size) {
+  static HpackEntry MakeEntryOfSize(uint32_t size) {
     EXPECT_GE(size, HpackEntry::kSizeOverhead);
     string name((size - HpackEntry::kSizeOverhead) / 2, 'n');
     string value(size - HpackEntry::kSizeOverhead - name.size(), 'v');
     HpackEntry entry(name, value, false, 0);
     EXPECT_EQ(size, entry.Size());
     return entry;
   }
 
   // Returns a vector of entries whose total size is equal to the given
   // one.
-  static HpackEntryVector MakeEntriesOfTotalSize(uint32 total_size) {
+  static HpackEntryVector MakeEntriesOfTotalSize(uint32_t total_size) {
     EXPECT_GE(total_size, HpackEntry::kSizeOverhead);
-    uint32 entry_size = HpackEntry::kSizeOverhead;
-    uint32 remaining_size = total_size;
+    uint32_t entry_size = HpackEntry::kSizeOverhead;
+    uint32_t remaining_size = total_size;
     HpackEntryVector entries;
     while (remaining_size > 0) {
       EXPECT_LE(entry_size, remaining_size);
       entries.push_back(MakeEntryOfSize(entry_size));
       remaining_size -= entry_size;
       entry_size = std::min(remaining_size, entry_size + 32);
     }
     return entries;
   }
 
@@ skipping 332 matching lines @@
   HpackEntry entry2(DynamicEntry("name", "value"));
 
   HpackHeaderTable::EntryComparator comparator;
   EXPECT_FALSE(comparator(&entry1, &entry1));
   EXPECT_FALSE(comparator(&entry2, &entry2));
 }
 
 }  // namespace
 
 }  // namespace net