gdata: Remove GDataCache::cache_entry()
This is in preparation for replacing GDataCacheEntry
with a proto.
BUG=136921
TEST=out/Release/unit_tests --gtest_filter=GData*
Review URL: https://chromiumcodereview.appspot.com/10689177
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146383 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/chromeos/gdata/gdata_cache_unittest.cc b/chrome/browser/chromeos/gdata/gdata_cache_unittest.cc
index 19f64e8..91bc9601 100644
--- a/chrome/browser/chromeos/gdata/gdata_cache_unittest.cc
+++ b/chrome/browser/chromeos/gdata/gdata_cache_unittest.cc
@@ -91,11 +91,6 @@
FilePath expected_existing_path;
};
-// Converts |cache_state| to a GDataCacheEntry.
-GDataCacheEntry ToCacheEntry(int cache_state) {
- return GDataCacheEntry("dummy_md5", cache_state);
-}
-
} // namespace
class MockFreeDiskSpaceGetter : public FreeDiskSpaceGetterInterface {
@@ -275,17 +270,17 @@
FilePath dest_path = cache_->GetCacheFilePath(
resource.resource_id,
resource.md5,
- ToCacheEntry(resource.cache_state).IsPinned() ||
- ToCacheEntry(resource.cache_state).IsDirty() ?
+ test_util::ToCacheEntry(resource.cache_state).IsPinned() ||
+ test_util::ToCacheEntry(resource.cache_state).IsDirty() ?
GDataCache::CACHE_TYPE_PERSISTENT :
GDataCache::CACHE_TYPE_TMP,
- ToCacheEntry(resource.cache_state).IsDirty() ?
+ test_util::ToCacheEntry(resource.cache_state).IsDirty() ?
GDataCache::CACHED_FILE_LOCALLY_MODIFIED :
GDataCache::CACHED_FILE_FROM_SERVER);
// Copy file from data dir to cache subdir, naming it per cache files
// convention.
- if (ToCacheEntry(resource.cache_state).IsPresent()) {
+ if (test_util::ToCacheEntry(resource.cache_state).IsPresent()) {
FilePath source_path = GetTestFilePath(resource.source_file);
ASSERT_TRUE(file_util::CopyFile(source_path, dest_path));
} else {
@@ -294,7 +289,7 @@
// Create symbolic link in pinned dir, naming it per cache files
// convention.
- if (ToCacheEntry(resource.cache_state).IsPinned()) {
+ if (test_util::ToCacheEntry(resource.cache_state).IsPinned()) {
FilePath link_path = cache_->GetCacheFilePath(
resource.resource_id,
"",
@@ -305,7 +300,7 @@
// Create symbolic link in outgoing dir, naming it per cache files
// convention.
- if (ToCacheEntry(resource.cache_state).IsDirty()) {
+ if (test_util::ToCacheEntry(resource.cache_state).IsDirty()) {
FilePath link_path = cache_->GetCacheFilePath(
resource.resource_id,
"",
@@ -327,7 +322,7 @@
TestGetFileFromCacheByResourceIdAndMd5(
resource.resource_id,
resource.md5,
- ToCacheEntry(resource.cache_state).IsPresent() ?
+ test_util::ToCacheEntry(resource.cache_state).IsPresent() ?
base::PLATFORM_FILE_OK :
base::PLATFORM_FILE_ERROR_NOT_FOUND,
resource.expected_file_extension);
@@ -335,12 +330,14 @@
// Verify cache state.
std::string md5;
- if (ToCacheEntry(resource.cache_state).IsPresent())
+ if (test_util::ToCacheEntry(resource.cache_state).IsPresent())
md5 = resource.md5;
GDataCacheEntry cache_entry;
ASSERT_TRUE(GetCacheEntryFromOriginThread(
resource.resource_id, md5, &cache_entry));
- EXPECT_EQ(resource.cache_state, cache_entry.cache_state());
+ EXPECT_TRUE(test_util::CacheStatesEqual(
+ test_util::ToCacheEntry(resource.cache_state),
+ cache_entry));
EXPECT_EQ(resource.expected_sub_dir_type,
GDataCache::GetSubDirectoryType(cache_entry));
}
@@ -571,7 +568,9 @@
EXPECT_EQ(expected_success_, success);
if (success) {
- EXPECT_EQ(expected_cache_state_, cache_entry.cache_state());
+ EXPECT_TRUE(test_util::CacheStatesEqual(
+ test_util::ToCacheEntry(expected_cache_state_),
+ cache_entry));
}
}
@@ -696,10 +695,12 @@
GDataCacheEntry cache_entry;
const bool cache_entry_found =
GetCacheEntryFromOriginThread(resource_id, md5, &cache_entry);
- if (ToCacheEntry(expected_cache_state_).IsPresent() ||
- ToCacheEntry(expected_cache_state_).IsPinned()) {
+ if (test_util::ToCacheEntry(expected_cache_state_).IsPresent() ||
+ test_util::ToCacheEntry(expected_cache_state_).IsPinned()) {
ASSERT_TRUE(cache_entry_found);
- EXPECT_EQ(expected_cache_state_, cache_entry.cache_state());
+ EXPECT_TRUE(test_util::CacheStatesEqual(
+ test_util::ToCacheEntry(expected_cache_state_),
+ cache_entry));
EXPECT_EQ(expected_sub_dir_type_,
GDataCache::GetSubDirectoryType(cache_entry));
} else {
@@ -710,15 +711,15 @@
FilePath dest_path = cache_->GetCacheFilePath(
resource_id,
md5,
- ToCacheEntry(expected_cache_state_).IsPinned() ||
- ToCacheEntry(expected_cache_state_).IsDirty() ?
+ test_util::ToCacheEntry(expected_cache_state_).IsPinned() ||
+ test_util::ToCacheEntry(expected_cache_state_).IsDirty() ?
GDataCache::CACHE_TYPE_PERSISTENT :
GDataCache::CACHE_TYPE_TMP,
- ToCacheEntry(expected_cache_state_).IsDirty() ?
+ test_util::ToCacheEntry(expected_cache_state_).IsDirty() ?
GDataCache::CACHED_FILE_LOCALLY_MODIFIED :
GDataCache::CACHED_FILE_FROM_SERVER);
bool exists = file_util::PathExists(dest_path);
- if (ToCacheEntry(expected_cache_state_).IsPresent())
+ if (test_util::ToCacheEntry(expected_cache_state_).IsPresent())
EXPECT_TRUE(exists);
else
EXPECT_FALSE(exists);
@@ -731,11 +732,11 @@
GDataCache::CACHED_FILE_FROM_SERVER);
// Check that pin symlink exists, without deferencing to target path.
exists = file_util::IsLink(symlink_path);
- if (ToCacheEntry(expected_cache_state_).IsPinned()) {
+ if (test_util::ToCacheEntry(expected_cache_state_).IsPinned()) {
EXPECT_TRUE(exists);
FilePath target_path;
EXPECT_TRUE(file_util::ReadSymbolicLink(symlink_path, &target_path));
- if (ToCacheEntry(expected_cache_state_).IsPresent())
+ if (test_util::ToCacheEntry(expected_cache_state_).IsPresent())
EXPECT_EQ(dest_path, target_path);
else
EXPECT_EQ(kSymLinkToDevNull, target_path.value());
@@ -752,12 +753,12 @@
// Check that outgoing symlink exists, without deferencing to target path.
exists = file_util::IsLink(symlink_path);
if (expect_outgoing_symlink_ &&
- ToCacheEntry(expected_cache_state_).IsDirty()) {
+ test_util::ToCacheEntry(expected_cache_state_).IsDirty()) {
EXPECT_TRUE(exists);
FilePath target_path;
EXPECT_TRUE(file_util::ReadSymbolicLink(symlink_path, &target_path));
EXPECT_TRUE(target_path.value() != kSymLinkToDevNull);
- if (ToCacheEntry(expected_cache_state_).IsPresent())
+ if (test_util::ToCacheEntry(expected_cache_state_).IsPresent())
EXPECT_EQ(dest_path, target_path);
} else {
EXPECT_FALSE(exists);
@@ -936,7 +937,7 @@
// cached file with the different md5 should be deleted.
FilePath path = GetCacheFilePath(
resource_id, "*",
- (ToCacheEntry(expected_cache_state_).IsPinned() ?
+ (test_util::ToCacheEntry(expected_cache_state_).IsPinned() ?
GDataCache::CACHE_TYPE_PERSISTENT :
GDataCache::CACHE_TYPE_TMP),
GDataCache::CACHED_FILE_FROM_SERVER);