Switch to standard integer types in net/.

net/disk_cache/disk_cache_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 #define NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "net/base/cache_type.h"
 #include "net/disk_cache/disk_cache.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 class IOBuffer;
@@ skipping 44 matching lines @@
 
     int OpenNextEntry(disk_cache::Entry** next_entry);
 
    private:
     scoped_ptr<disk_cache::Backend::Iterator> iterator_;
   };
 
   DiskCacheTestWithCache();
   ~DiskCacheTestWithCache() override;
 
-  void CreateBackend(uint32 flags, base::Thread* thread);
+  void CreateBackend(uint32_t flags, base::Thread* thread);
 
   void InitCache();
   void SimulateCrash();
   void SetTestMode();
 
   void SetMemoryOnlyMode() {
     memory_only_ = true;
   }
 
   void SetSimpleCacheMode() {
     simple_cache_mode_ = true;
   }
 
-  void SetMask(uint32 mask) {
-    mask_ = mask;
-  }
+  void SetMask(uint32_t mask) { mask_ = mask; }
 
   void SetMaxSize(int size);
 
   // Deletes and re-creates the files on initialization errors.
   void SetForceCreation() {
     force_creation_ = true;
   }
 
   void SetNewEviction() {
     new_eviction_ = true;
@@ skipping 28 matching lines @@
                          const base::Time end_time);
   int CalculateSizeOfAllEntries();
   int DoomEntriesSince(const base::Time initial_time);
   scoped_ptr<TestIterator> CreateIterator();
   void FlushQueueForTest();
   void RunTaskForTest(const base::Closure& closure);
   int ReadData(disk_cache::Entry* entry, int index, int offset,
                net::IOBuffer* buf, int len);
   int WriteData(disk_cache::Entry* entry, int index, int offset,
                 net::IOBuffer* buf, int len, bool truncate);
-  int ReadSparseData(disk_cache::Entry* entry, int64 offset, net::IOBuffer* buf,
+  int ReadSparseData(disk_cache::Entry* entry,
+                     int64_t offset,
+                     net::IOBuffer* buf,
                      int len);
-  int WriteSparseData(disk_cache::Entry* entry, int64 offset,
-                      net::IOBuffer* buf, int len);
+  int WriteSparseData(disk_cache::Entry* entry,
+                      int64_t offset,
+                      net::IOBuffer* buf,
+                      int len);
 
   // Asks the cache to trim an entry. If |empty| is true, the whole cache is
   // deleted.
   void TrimForTest(bool empty);
 
   // Asks the cache to trim an entry from the deleted list. If |empty| is
   // true, the whole list is deleted.
   void TrimDeletedListForTest(bool empty);
 
   // Makes sure that some time passes before continuing the test. Time::Now()
   // before and after this method will not be the same.
   void AddDelay();
 
   // DiskCacheTest:
   void TearDown() override;
 
   // cache_ will always have a valid object, regardless of how the cache was
   // initialized. The implementation pointers can be NULL.
   scoped_ptr<disk_cache::Backend> cache_;
   disk_cache::BackendImpl* cache_impl_;
   disk_cache::SimpleBackendImpl* simple_cache_impl_;
   disk_cache::MemBackendImpl* mem_cache_;
 
-  uint32 mask_;
+  uint32_t mask_;
   int size_;
   net::CacheType type_;
   bool memory_only_;
   bool simple_cache_mode_;
   bool simple_cache_wait_for_index_;
   bool force_creation_;
   bool new_eviction_;
   bool first_cleanup_;
   bool integrity_;
   bool use_current_thread_;
   // This is intentionally left uninitialized, to be used by any test.
   bool success_;
 
  private:
   void InitMemoryCache();
   void InitDiskCache();
 
   base::Thread cache_thread_;
   DISALLOW_COPY_AND_ASSIGN(DiskCacheTestWithCache);
 };
 
 #endif  // NET_DISK_CACHE_DISK_CACHE_TEST_BASE_H_