Switch to standard integer types in net/.

net/disk_cache/blockfile/bitmap_unittest.cc

 // Copyright (c) 2009 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/disk_cache/blockfile/bitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(BitmapTest, OverAllocate) {
   // Test that we don't over allocate on boundaries.
   disk_cache::Bitmap map32(32, false);
   EXPECT_EQ(1, map32.ArraySize());
 
   disk_cache::Bitmap map64(64, false);
   EXPECT_EQ(2, map64.ArraySize());
 }
 
 TEST(BitmapTest, DefaultConstructor) {
   // Verify that the default constructor doesn't allocate a bitmap.
   disk_cache::Bitmap map;
   EXPECT_EQ(0, map.Size());
   EXPECT_EQ(0, map.ArraySize());
   EXPECT_TRUE(NULL == map.GetMap());
 }
 
 TEST(BitmapTest, Basics) {
   disk_cache::Bitmap bitmap(80, true);
-  const uint32 kValue = 0x74f10060;
+  const uint32_t kValue = 0x74f10060;
 
   // Test proper allocation size.
   EXPECT_EQ(80, bitmap.Size());
   EXPECT_EQ(3, bitmap.ArraySize());
 
   // Test Set/GetMapElement.
   EXPECT_EQ(0U, bitmap.GetMapElement(1));
   bitmap.SetMapElement(1, kValue);
   EXPECT_EQ(kValue, bitmap.GetMapElement(1));
 
@@ skipping 49 matching lines @@
 }
 
 TEST(BitmapTest, Map) {
   // Tests Set/GetMap and the constructor that takes an array.
   const int kMapSize = 80;
   char local_map[kMapSize];
   for (int i = 0; i < kMapSize; i++)
     local_map[i] = static_cast<char>(i);
 
   disk_cache::Bitmap bitmap(kMapSize * 8, false);
-  bitmap.SetMap(reinterpret_cast<uint32*>(local_map), kMapSize / 4);
+  bitmap.SetMap(reinterpret_cast<uint32_t*>(local_map), kMapSize / 4);
   for (int i = 0; i < kMapSize; i++) {
     if (i % 2)
       EXPECT_TRUE(bitmap.Get(i * 8));
     else
       EXPECT_FALSE(bitmap.Get(i * 8));
   }
 
   EXPECT_EQ(0, memcmp(local_map, bitmap.GetMap(), kMapSize));
 
   // Now let's create a bitmap that shares local_map as storage.
-  disk_cache::Bitmap bitmap2(reinterpret_cast<uint32*>(local_map),
+  disk_cache::Bitmap bitmap2(reinterpret_cast<uint32_t*>(local_map),
                              kMapSize * 8, kMapSize / 4);
   EXPECT_EQ(0, memcmp(local_map, bitmap2.GetMap(), kMapSize));
 
   local_map[kMapSize / 2] = 'a';
   EXPECT_EQ(0, memcmp(local_map, bitmap2.GetMap(), kMapSize));
   EXPECT_NE(0, memcmp(local_map, bitmap.GetMap(), kMapSize));
 }
 
 TEST(BitmapTest, SetAll) {
   // Tests SetAll and Clear.
@@ skipping 165 matching lines @@
   bitmap.SetMapElement(11, 0xff);
 
   index = 0;
   EXPECT_EQ(16, bitmap.FindBits(&index, 500, true));
   EXPECT_EQ(344, index);
 
   index = 0;
   EXPECT_EQ(4, bitmap.FindBits(&index, 348, true));
   EXPECT_EQ(344, index);
 }