Index: content/browser/cache_storage/cache_storage_manager_unittest.cc |
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc |
index 83e80aa2c38d8bf236d0bf8dec7774ba6a1c2102..89b9db4afed7433ed54a8c30f349731ba2970c98 100644 |
--- a/content/browser/cache_storage/cache_storage_manager_unittest.cc |
+++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc |
@@ -4,10 +4,14 @@ |
#include "content/browser/cache_storage/cache_storage_manager.h" |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include "base/files/file_path.h" |
#include "base/files/file_util.h" |
#include "base/files/scoped_temp_dir.h" |
#include "base/guid.h" |
+#include "base/macros.h" |
#include "base/run_loop.h" |
#include "base/sha1.h" |
#include "base/stl_util.h" |
@@ -263,7 +267,7 @@ class CacheStorageManagerTest : public testing::Test { |
return cache_manager_->FindOrCreateCacheStorage(origin); |
} |
- int64 GetOriginUsage(const GURL& origin) { |
+ int64_t GetOriginUsage(const GURL& origin) { |
base::RunLoop loop; |
cache_manager_->GetOriginUsage( |
origin, base::Bind(&CacheStorageManagerTest::UsageCallback, |
@@ -272,7 +276,7 @@ class CacheStorageManagerTest : public testing::Test { |
return callback_usage_; |
} |
- void UsageCallback(base::RunLoop* run_loop, int64 usage) { |
+ void UsageCallback(base::RunLoop* run_loop, int64_t usage) { |
callback_usage_ = usage; |
run_loop->Quit(); |
} |
@@ -315,7 +319,7 @@ class CacheStorageManagerTest : public testing::Test { |
const GURL origin1_; |
const GURL origin2_; |
- int64 callback_usage_; |
+ int64_t callback_usage_; |
std::vector<CacheStorageUsageInfo> callback_all_origins_usage_; |
private: |
@@ -622,7 +626,7 @@ TEST_F(CacheStorageManagerMemoryOnlyTest, MemoryBackedSize) { |
EXPECT_TRUE(CachePut(foo_cache, GURL("http://example.com/foo"))); |
EXPECT_LT(0, cache_storage->MemoryBackedSize()); |
- int64 foo_size = cache_storage->MemoryBackedSize(); |
+ int64_t foo_size = cache_storage->MemoryBackedSize(); |
EXPECT_TRUE(CachePut(bar_cache, GURL("http://example.com/foo"))); |
EXPECT_EQ(foo_size * 2, cache_storage->MemoryBackedSize()); |
@@ -855,7 +859,7 @@ class CacheStorageQuotaClientTest : public CacheStorageManagerTest { |
new CacheStorageQuotaClient(cache_manager_->AsWeakPtr())); |
} |
- void QuotaUsageCallback(base::RunLoop* run_loop, int64 usage) { |
+ void QuotaUsageCallback(base::RunLoop* run_loop, int64_t usage) { |
callback_quota_usage_ = usage; |
run_loop->Quit(); |
} |
@@ -871,7 +875,7 @@ class CacheStorageQuotaClientTest : public CacheStorageManagerTest { |
run_loop->Quit(); |
} |
- int64 QuotaGetOriginUsage(const GURL& origin) { |
+ int64_t QuotaGetOriginUsage(const GURL& origin) { |
base::RunLoop loop; |
quota_client_->GetOriginUsage( |
origin, storage::kStorageTypeTemporary, |
@@ -918,7 +922,7 @@ class CacheStorageQuotaClientTest : public CacheStorageManagerTest { |
scoped_ptr<CacheStorageQuotaClient> quota_client_; |
storage::QuotaStatusCode callback_status_; |
- int64 callback_quota_usage_ = 0; |
+ int64_t callback_quota_usage_ = 0; |
std::set<GURL> callback_origins_; |
DISALLOW_COPY_AND_ASSIGN(CacheStorageQuotaClientTest); |