Index: chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc |
diff --git a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc |
index 2c712daa39c5f0c4e9a241e9613df24c6a039889..d32282f9b6569f9e1da6c3da2ad3725de608c169 100644 |
--- a/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc |
+++ b/chrome/browser/chromeos/drive/stale_cache_files_remover_unittest.cc |
@@ -40,7 +40,7 @@ using ::testing::Return; |
using ::testing::StrictMock; |
using ::testing::_; |
-namespace gdata { |
+namespace drive { |
namespace { |
const int64 kLotsOfSpace = kMinFreeSpace * 10; |
@@ -113,7 +113,7 @@ class StaleCacheFilesRemoverTest : public testing::Test { |
stale_cache_files_remover_.reset(new StaleCacheFilesRemover(file_system_, |
cache_)); |
- test_util::RunBlockingPoolTask(); |
+ gdata::test_util::RunBlockingPoolTask(); |
} |
virtual void TearDown() OVERRIDE { |
@@ -127,7 +127,7 @@ class StaleCacheFilesRemoverTest : public testing::Test { |
SetFreeDiskSpaceGetterForTesting(NULL); |
cache_->DestroyOnUIThread(); |
// The cache destruction requires to post a task to the blocking pool. |
- test_util::RunBlockingPoolTask(); |
+ gdata::test_util::RunBlockingPoolTask(); |
profile_.reset(NULL); |
} |
@@ -161,7 +161,8 @@ class StaleCacheFilesRemoverTest : public testing::Test { |
}; |
TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
- FilePath dummy_file = test_util::GetTestFilePath("gdata/root_feed.json"); |
+ FilePath dummy_file = |
+ gdata::test_util::GetTestFilePath("gdata/root_feed.json"); |
std::string resource_id("pdf:1a2b3c"); |
std::string md5("abcdef0123456789"); |
@@ -171,8 +172,8 @@ TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
// Create a stale cache file. |
cache_->StoreOnUIThread(resource_id, md5, dummy_file, |
DriveCache::FILE_OPERATION_COPY, |
- base::Bind(&gdata::VerifyCacheFileState)); |
- test_util::RunBlockingPoolTask(); |
+ base::Bind(&VerifyCacheFileState)); |
+ gdata::test_util::RunBlockingPoolTask(); |
// Verify that the cache file exists. |
FilePath path = cache_->GetCacheFilePath(resource_id, |
@@ -196,7 +197,7 @@ TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
&error, |
&unused, |
&entry_proto)); |
- test_util::RunBlockingPoolTask(); |
+ gdata::test_util::RunBlockingPoolTask(); |
EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error); |
file_system_->GetEntryInfoByPath( |
@@ -204,7 +205,7 @@ TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
base::Bind(&test_util::CopyResultsFromGetEntryInfoCallback, |
&error, |
&entry_proto)); |
- test_util::RunBlockingPoolTask(); |
+ gdata::test_util::RunBlockingPoolTask(); |
EXPECT_EQ(DRIVE_FILE_ERROR_NOT_FOUND, error); |
EXPECT_FALSE(entry_proto.get()); |
@@ -212,7 +213,7 @@ TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
LoadRootFeedDocument("gdata/root_feed.json"); |
// Wait for StaleCacheFilesRemover to finish cleaning up the stale file. |
- test_util::RunBlockingPoolTask(); |
+ gdata::test_util::RunBlockingPoolTask(); |
// Verify that the cache file is deleted. |
path = cache_->GetCacheFilePath(resource_id, |
@@ -222,4 +223,4 @@ TEST_F(StaleCacheFilesRemoverTest, RemoveStaleCacheFiles) { |
EXPECT_FALSE(file_util::PathExists(path)); |
} |
-} // namespace gdata |
+} // namespace drive |