Switch to standard integer types in net/.

net/disk_cache/simple/simple_version_upgrade.cc

 // Copyright 2013 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/simple/simple_version_upgrade.h"
 
 #include <cstring>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "net/disk_cache/simple/simple_backend_version.h"
 #include "net/disk_cache/simple/simple_entry_format_history.h"
 #include "third_party/zlib/zlib.h"
 
 namespace {
 
 // It is not possible to upgrade cache structures on disk that are of version
 // below this, the entire cache should be dropped for them.
-const uint32 kMinVersionAbleToUpgrade = 5;
+const uint32_t kMinVersionAbleToUpgrade = 5;
 
 const char kFakeIndexFileName[] = "index";
 const char kIndexFileName[] = "the-real-index";
 
 void LogMessageFailedUpgradeFromVersion(int version) {
   LOG(ERROR) << "Failed to upgrade Simple Cache from version: " << version;
 }
 
 bool WriteFakeIndexFile(const base::FilePath& file_name) {
   base::File file(file_name,  base::File::FLAG_CREATE | base::File::FLAG_WRITE);
@@ skipping 114 matching lines @@
                                         reinterpret_cast<char*>(&file_header),
                                         sizeof(file_header));
   if (bytes_read != sizeof(file_header) ||
       file_header.initial_magic_number !=
           disk_cache::simplecache_v5::kSimpleInitialMagicNumber) {
     LOG(ERROR) << "File structure does not match the disk cache backend.";
     return false;
   }
   fake_index_file.Close();
 
-  uint32 version_from = file_header.version;
+  uint32_t version_from = file_header.version;
   if (version_from < kMinVersionAbleToUpgrade ||
       version_from > kSimpleVersion) {
     LOG(ERROR) << "Inconsistent cache version.";
     return false;
   }
   bool upgrade_needed = (version_from != kSimpleVersion);
   if (version_from == kMinVersionAbleToUpgrade) {
     // Upgrade only the index for V4 -> V5 move.
     if (!UpgradeIndexV5V6(path)) {
       LogMessageFailedUpgradeFromVersion(file_header.version);
@@ skipping 21 matching lines @@
     }
   }
   // Verify during the test stage that the upgraders are implemented for all
   // versions. The release build would cause backend initialization failure
   // which would then later lead to removing all files known to the backend.
   DCHECK_EQ(kSimpleVersion, version_from);
   return false;
 }
 
 }  // namespace disk_cache