Index: content/browser/cache_storage/cache_storage_cache_unittest.cc |
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc |
index 51f6736ffa6927cba8e4fde11dc25eaa61f67f8b..d87baa7bcecdfbb150102d6c28169c17d2aa1fce 100644 |
--- a/content/browser/cache_storage/cache_storage_cache_unittest.cc |
+++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc |
@@ -4,8 +4,12 @@ |
#include "content/browser/cache_storage/cache_storage_cache.h" |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include "base/files/file_path.h" |
#include "base/files/scoped_temp_dir.h" |
+#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/run_loop.h" |
@@ -57,7 +61,7 @@ class DelayableBackend : public disk_cache::Backend { |
net::CacheType GetCacheType() const override { |
return backend_->GetCacheType(); |
} |
- int32 GetEntryCount() const override { return backend_->GetEntryCount(); } |
+ int32_t GetEntryCount() const override { return backend_->GetEntryCount(); } |
int OpenEntry(const std::string& key, |
disk_cache::Entry** entry, |
const CompletionCallback& callback) override { |
@@ -139,7 +143,7 @@ void CopyBody(const storage::BlobDataHandle& blob_handle, std::string* output) { |
} |
case storage::DataElement::TYPE_DISK_CACHE_ENTRY: { |
disk_cache::Entry* entry = item->disk_cache_entry(); |
- int32 body_size = entry->GetDataSize(item->disk_cache_stream_index()); |
+ int32_t body_size = entry->GetDataSize(item->disk_cache_stream_index()); |
scoped_refptr<net::IOBuffer> io_buffer = new net::IOBuffer(body_size); |
net::TestCompletionCallback callback; |
@@ -912,7 +916,7 @@ TEST_P(CacheStorageCacheTestP, QuotaManagerModified) { |
EXPECT_TRUE(Put(no_body_request_, no_body_response_)); |
EXPECT_EQ(1, quota_manager_proxy_->notify_storage_modified_count()); |
EXPECT_LT(0, quota_manager_proxy_->last_notified_delta()); |
- int64 sum_delta = quota_manager_proxy_->last_notified_delta(); |
+ int64_t sum_delta = quota_manager_proxy_->last_notified_delta(); |
EXPECT_TRUE(Put(body_request_, body_response_)); |
EXPECT_EQ(2, quota_manager_proxy_->notify_storage_modified_count()); |
@@ -934,7 +938,7 @@ TEST_F(CacheStorageCacheMemoryOnlyTest, MemoryBackedSize) { |
EXPECT_EQ(0, cache_->MemoryBackedSize()); |
EXPECT_TRUE(Put(no_body_request_, no_body_response_)); |
EXPECT_LT(0, cache_->MemoryBackedSize()); |
- int64 no_body_size = cache_->MemoryBackedSize(); |
+ int64_t no_body_size = cache_->MemoryBackedSize(); |
EXPECT_TRUE(Delete(no_body_request_)); |
EXPECT_EQ(0, cache_->MemoryBackedSize()); |