diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-02 05:12:33 +0000 |
commit | a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e (patch) | |
tree | bdd4dac76e6034ef6cf33450e203269a715ea0e6 /webkit/fileapi/file_system_usage_cache_unittest.cc | |
parent | 8bc574c57115e9ffd0169f33131c0865997dcb35 (diff) | |
download | chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.zip chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.gz chromium_src-a3ef4830d5b5fdc52e5d7d0cb33dae8844f0961e.tar.bz2 |
Add FilePath to base namespace.
This updates headers that forward-declare it and a few random places to use the namespace explicitly. There us a using declaration in file_path.h that makes the rest compile, which we can do in future passes.
Review URL: https://codereview.chromium.org/12163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/fileapi/file_system_usage_cache_unittest.cc')
-rw-r--r-- | webkit/fileapi/file_system_usage_cache_unittest.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc index 8662dc8..edc4457 100644 --- a/webkit/fileapi/file_system_usage_cache_unittest.cc +++ b/webkit/fileapi/file_system_usage_cache_unittest.cc @@ -20,7 +20,7 @@ class FileSystemUsageCacheTest : public testing::Test { } protected: - FilePath GetUsageFilePath() { + base::FilePath GetUsageFilePath() { return data_dir_.path().Append(FileSystemUsageCache::kUsageFileName); } @@ -31,14 +31,14 @@ class FileSystemUsageCacheTest : public testing::Test { }; TEST_F(FileSystemUsageCacheTest, CreateTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); EXPECT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, 0)); } TEST_F(FileSystemUsageCacheTest, SetSizeTest) { static const int64 size = 240122; - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, size)); EXPECT_EQ(size, FileSystemUsageCache::GetUsage(usage_file_path)); @@ -46,14 +46,14 @@ TEST_F(FileSystemUsageCacheTest, SetSizeTest) { TEST_F(FileSystemUsageCacheTest, SetLargeSizeTest) { static const int64 size = kint64max; - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, size)); EXPECT_EQ(size, FileSystemUsageCache::GetUsage(usage_file_path)); } TEST_F(FileSystemUsageCacheTest, IncAndGetSizeTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, 98214)); ASSERT_TRUE(FileSystemUsageCache::IncrementDirty(usage_file_path)); @@ -63,7 +63,7 @@ TEST_F(FileSystemUsageCacheTest, IncAndGetSizeTest) { TEST_F(FileSystemUsageCacheTest, DecAndGetSizeTest) { static const int64 size = 71839; - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, size)); // DecrementDirty for dirty = 0 is invalid. It returns false. @@ -73,7 +73,7 @@ TEST_F(FileSystemUsageCacheTest, DecAndGetSizeTest) { TEST_F(FileSystemUsageCacheTest, IncDecAndGetSizeTest) { static const int64 size = 198491; - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, size)); ASSERT_TRUE(FileSystemUsageCache::IncrementDirty(usage_file_path)); @@ -82,7 +82,7 @@ TEST_F(FileSystemUsageCacheTest, IncDecAndGetSizeTest) { } TEST_F(FileSystemUsageCacheTest, DecIncAndGetSizeTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, 854238)); // DecrementDirty for dirty = 0 is invalid. It returns false. @@ -96,7 +96,7 @@ TEST_F(FileSystemUsageCacheTest, DecIncAndGetSizeTest) { TEST_F(FileSystemUsageCacheTest, ManyIncsSameDecsAndGetSizeTest) { static const int64 size = 82412; - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, size)); for (int i = 0; i < 20; i++) @@ -107,7 +107,7 @@ TEST_F(FileSystemUsageCacheTest, ManyIncsSameDecsAndGetSizeTest) { } TEST_F(FileSystemUsageCacheTest, ManyIncsLessDecsAndGetSizeTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); ASSERT_EQ(FileSystemUsageCache::kUsageFileSize, FileSystemUsageCache::UpdateUsage(usage_file_path, 19319)); for (int i = 0; i < 20; i++) @@ -119,17 +119,17 @@ TEST_F(FileSystemUsageCacheTest, ManyIncsLessDecsAndGetSizeTest) { } TEST_F(FileSystemUsageCacheTest, GetSizeWithoutCacheFileTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); EXPECT_EQ(-1, FileSystemUsageCache::GetUsage(usage_file_path)); } TEST_F(FileSystemUsageCacheTest, IncrementDirtyWithoutCacheFileTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); EXPECT_FALSE(FileSystemUsageCache::IncrementDirty(usage_file_path)); } TEST_F(FileSystemUsageCacheTest, DecrementDirtyWithoutCacheFileTest) { - FilePath usage_file_path = GetUsageFilePath(); + base::FilePath usage_file_path = GetUsageFilePath(); EXPECT_FALSE(FileSystemUsageCache::IncrementDirty(usage_file_path)); } |