Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/gdata/drive_cache_unittest.cc

Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/gdata/drive_cache.cc ('k') | chrome/browser/chromeos/gdata/drive_errorcode.h » ('j') | chrome/browser/chromeos/gdata/gdata_contacts_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/drive_cache_unittest.cc
diff --git a/chrome/browser/chromeos/gdata/drive_cache_unittest.cc b/chrome/browser/chromeos/gdata/drive_cache_unittest.cc
index 841e07ede700edef03b5005526d0dc5b66aed23f..9431bb3059c45ae0d31ee839fc0f4811c828ee72 100644
--- a/chrome/browser/chromeos/gdata/drive_cache_unittest.cc
+++ b/chrome/browser/chromeos/gdata/drive_cache_unittest.cc
@@ -115,9 +115,9 @@ void OnGetResourceIds(std::vector<std::string>* out_resource_ids,
}
// Copies results from ClearAllOnUIThread.
-void OnClearAll(GDataFileError* out_error,
+void OnClearAll(DriveFileError* out_error,
FilePath* out_file_path,
- GDataFileError error,
+ DriveFileError error,
const FilePath& file_path) {
*out_file_path = file_path;
*out_error = error;
@@ -132,7 +132,7 @@ class DriveCacheTest : public testing::Test {
io_thread_(content::BrowserThread::IO),
cache_(NULL),
num_callback_invocations_(0),
- expected_error_(GDATA_FILE_OK),
+ expected_error_(DRIVE_FILE_OK),
expected_cache_state_(0),
expected_sub_dir_type_(DriveCache::CACHE_TYPE_META),
expected_success_(true),
@@ -248,8 +248,8 @@ class DriveCacheTest : public testing::Test {
resource.resource_id,
resource.md5,
test_util::ToCacheEntry(resource.cache_state).is_present() ?
- GDATA_FILE_OK :
- GDATA_FILE_ERROR_NOT_FOUND,
+ DRIVE_FILE_OK :
+ DRIVE_FILE_ERROR_NOT_FOUND,
resource.expected_file_extension);
EXPECT_EQ(1, num_callback_invocations_);
@@ -271,7 +271,7 @@ class DriveCacheTest : public testing::Test {
void TestGetFileFromCacheByResourceIdAndMd5(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
const std::string& expected_file_extension) {
expected_error_ = expected_error;
expected_file_extension_ = expected_file_extension;
@@ -288,7 +288,7 @@ class DriveCacheTest : public testing::Test {
const std::string& resource_id,
const std::string& md5,
const FilePath& source_path,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -304,7 +304,7 @@ class DriveCacheTest : public testing::Test {
test_util::RunBlockingPoolTask();
}
- void VerifyGetFromCache(GDataFileError error,
+ void VerifyGetFromCache(DriveFileError error,
const std::string& resource_id,
const std::string& md5,
const FilePath& cache_file_path) {
@@ -312,7 +312,7 @@ class DriveCacheTest : public testing::Test {
EXPECT_EQ(expected_error_, error);
- if (error == GDATA_FILE_OK) {
+ if (error == DRIVE_FILE_OK) {
// Verify filename of |cache_file_path|.
FilePath base_name = cache_file_path.BaseName();
EXPECT_EQ(util::EscapeCacheFileName(resource_id) +
@@ -327,7 +327,7 @@ class DriveCacheTest : public testing::Test {
}
void TestRemoveFromCache(const std::string& resource_id,
- GDataFileError expected_error) {
+ DriveFileError expected_error) {
expected_error_ = expected_error;
cache_->RemoveOnUIThread(
@@ -338,7 +338,7 @@ class DriveCacheTest : public testing::Test {
test_util::RunBlockingPoolTask();
}
- void VerifyRemoveFromCache(GDataFileError error,
+ void VerifyRemoveFromCache(DriveFileError error,
const std::string& resource_id,
const std::string& md5) {
++num_callback_invocations_;
@@ -436,7 +436,7 @@ class DriveCacheTest : public testing::Test {
void TestPin(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -454,7 +454,7 @@ class DriveCacheTest : public testing::Test {
void TestUnpin(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -472,7 +472,7 @@ class DriveCacheTest : public testing::Test {
void TestMarkDirty(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -488,14 +488,14 @@ class DriveCacheTest : public testing::Test {
test_util::RunBlockingPoolTask();
}
- void VerifyMarkDirty(GDataFileError error,
+ void VerifyMarkDirty(DriveFileError error,
const std::string& resource_id,
const std::string& md5,
const FilePath& cache_file_path) {
VerifyCacheFileState(error, resource_id, md5);
// Verify filename of |cache_file_path|.
- if (error == GDATA_FILE_OK) {
+ if (error == DRIVE_FILE_OK) {
FilePath base_name = cache_file_path.BaseName();
EXPECT_EQ(util::EscapeCacheFileName(resource_id) +
FilePath::kExtensionSeparator +
@@ -509,7 +509,7 @@ class DriveCacheTest : public testing::Test {
void TestCommitDirty(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -528,7 +528,7 @@ class DriveCacheTest : public testing::Test {
void TestClearDirty(
const std::string& resource_id,
const std::string& md5,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -548,7 +548,7 @@ class DriveCacheTest : public testing::Test {
const std::string& md5,
const FilePath& file_path,
bool to_mount,
- GDataFileError expected_error,
+ DriveFileError expected_error,
int expected_cache_state,
DriveCache::CacheSubDirectoryType expected_sub_dir_type) {
expected_error_ = expected_error;
@@ -566,7 +566,7 @@ class DriveCacheTest : public testing::Test {
void VerifySetMountedState(const std::string& resource_id,
const std::string& md5,
bool to_mount,
- GDataFileError error,
+ DriveFileError error,
const FilePath& file_path) {
++num_callback_invocations_;
EXPECT_TRUE(file_util::PathExists(file_path));
@@ -579,7 +579,7 @@ class DriveCacheTest : public testing::Test {
DriveCache::CACHED_FILE_FROM_SERVER));
}
- void VerifyCacheFileState(GDataFileError error,
+ void VerifyCacheFileState(DriveFileError error,
const std::string& resource_id,
const std::string& md5) {
++num_callback_invocations_;
@@ -774,7 +774,7 @@ class DriveCacheTest : public testing::Test {
scoped_ptr<StrictMock<MockDriveCacheObserver> > mock_cache_observer_;
int num_callback_invocations_;
- GDataFileError expected_error_;
+ DriveFileError expected_error_;
int expected_cache_state_;
DriveCache::CacheSubDirectoryType expected_sub_dir_type_;
bool expected_success_;
@@ -818,14 +818,14 @@ TEST_F(DriveCacheTest, StoreToCacheSimple) {
// Store an existing file.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Store a non-existent file to the same |resource_id| and |md5|.
num_callback_invocations_ = 0;
TestStoreToCache(resource_id, md5, FilePath("./non_existent.json"),
- GDATA_FILE_ERROR_FAILED,
+ DRIVE_FILE_ERROR_FAILED,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -835,7 +835,7 @@ TEST_F(DriveCacheTest, StoreToCacheSimple) {
md5 = "new_md5";
num_callback_invocations_ = 0;
TestStoreToCache(resource_id, md5, GetTestFilePath("subdir_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -852,20 +852,20 @@ TEST_F(DriveCacheTest, GetFromCacheSimple) {
std::string md5("abcdef0123456789");
// First store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Then try to get the existing file from cache.
num_callback_invocations_ = 0;
TestGetFileFromCacheByResourceIdAndMd5(
- resource_id, md5, GDATA_FILE_OK, md5);
+ resource_id, md5, DRIVE_FILE_OK, md5);
EXPECT_EQ(1, num_callback_invocations_);
// Get file from cache with same resource id as existing file but different
// md5.
num_callback_invocations_ = 0;
TestGetFileFromCacheByResourceIdAndMd5(
- resource_id, "9999", GDATA_FILE_ERROR_NOT_FOUND, md5);
+ resource_id, "9999", DRIVE_FILE_ERROR_NOT_FOUND, md5);
EXPECT_EQ(1, num_callback_invocations_);
// Get file from cache with different resource id from existing file but same
@@ -873,7 +873,7 @@ TEST_F(DriveCacheTest, GetFromCacheSimple) {
num_callback_invocations_ = 0;
resource_id = "document:1a2b";
TestGetFileFromCacheByResourceIdAndMd5(
- resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND, md5);
+ resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND, md5);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -886,23 +886,23 @@ TEST_F(DriveCacheTest, RemoveFromCacheSimple) {
std::string md5("abcdef0123456789");
// First store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Then try to remove existing file from cache.
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
// Repeat using non-alphanumeric characters for resource id, including '.'
// which is an extension separator.
resource_id = "pdf:`~!@#$%^&*()-_=+[{|]}\\;',<.>/?";
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -918,12 +918,12 @@ TEST_F(DriveCacheTest, PinAndUnpin) {
// First store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Pin the existing file in cache.
num_callback_invocations_ = 0;
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -932,14 +932,14 @@ TEST_F(DriveCacheTest, PinAndUnpin) {
// Unpin the existing file in cache.
num_callback_invocations_ = 0;
- TestUnpin(resource_id, md5, GDATA_FILE_OK,
+ TestUnpin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Pin back the same existing file in cache.
num_callback_invocations_ = 0;
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -953,14 +953,14 @@ TEST_F(DriveCacheTest, PinAndUnpin) {
.Times(1);
num_callback_invocations_ = 0;
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PINNED,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Unpin the previously pinned non-existent file in cache.
num_callback_invocations_ = 0;
- TestUnpin(resource_id, md5, GDATA_FILE_OK,
+ TestUnpin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -973,7 +973,7 @@ TEST_F(DriveCacheTest, PinAndUnpin) {
.Times(0);
num_callback_invocations_ = 0;
- TestUnpin(resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND,
+ TestUnpin(resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP /* non-applicable */);
EXPECT_EQ(1, num_callback_invocations_);
@@ -988,14 +988,14 @@ TEST_F(DriveCacheTest, StoreToCachePinned) {
EXPECT_CALL(*mock_cache_observer_, OnCachePinned(resource_id, md5)).Times(1);
// Pin a non-existent file.
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PINNED,
DriveCache::CACHE_TYPE_TMP);
// Store an existing file to a previously pinned file.
num_callback_invocations_ = 0;
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK,
+ DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1005,7 +1005,7 @@ TEST_F(DriveCacheTest, StoreToCachePinned) {
// Store a non-existent file to a previously pinned and stored file.
num_callback_invocations_ = 0;
TestStoreToCache(resource_id, md5, FilePath("./non_existent.json"),
- GDATA_FILE_ERROR_FAILED,
+ DRIVE_FILE_ERROR_FAILED,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1022,19 +1022,19 @@ TEST_F(DriveCacheTest, GetFromCachePinned) {
EXPECT_CALL(*mock_cache_observer_, OnCachePinned(resource_id, md5)).Times(1);
// Pin a non-existent file.
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PINNED,
DriveCache::CACHE_TYPE_TMP);
// Get the non-existent pinned file from cache.
num_callback_invocations_ = 0;
TestGetFileFromCacheByResourceIdAndMd5(
- resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND, md5);
+ resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND, md5);
EXPECT_EQ(1, num_callback_invocations_);
// Store an existing file to the previously pinned non-existent file.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK,
+ DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1043,7 +1043,7 @@ TEST_F(DriveCacheTest, GetFromCachePinned) {
// Get the previously pinned and stored file from cache.
num_callback_invocations_ = 0;
TestGetFileFromCacheByResourceIdAndMd5(
- resource_id, md5, GDATA_FILE_OK, md5);
+ resource_id, md5, DRIVE_FILE_OK, md5);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -1058,9 +1058,9 @@ TEST_F(DriveCacheTest, RemoveFromCachePinned) {
// Store a file to cache, and pin it.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1068,7 +1068,7 @@ TEST_F(DriveCacheTest, RemoveFromCachePinned) {
// Remove |resource_id| from cache.
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
// Repeat using non-alphanumeric characters for resource id, including '.'
@@ -1077,16 +1077,16 @@ TEST_F(DriveCacheTest, RemoveFromCachePinned) {
EXPECT_CALL(*mock_cache_observer_, OnCachePinned(resource_id, md5)).Times(1);
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
DriveCache::CACHE_TYPE_PERSISTENT);
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -1100,12 +1100,12 @@ TEST_F(DriveCacheTest, DirtyCacheSimple) {
// First store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Mark the file dirty.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1114,7 +1114,7 @@ TEST_F(DriveCacheTest, DirtyCacheSimple) {
// Commit the file dirty.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1123,7 +1123,7 @@ TEST_F(DriveCacheTest, DirtyCacheSimple) {
// Clear dirty state of the file.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_OK,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -1140,9 +1140,9 @@ TEST_F(DriveCacheTest, DirtyCachePinned) {
// First store a file to cache and pin it.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1150,7 +1150,7 @@ TEST_F(DriveCacheTest, DirtyCachePinned) {
// Mark the file dirty.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PINNED |
@@ -1160,7 +1160,7 @@ TEST_F(DriveCacheTest, DirtyCachePinned) {
// Commit the file dirty.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PINNED |
@@ -1170,7 +1170,7 @@ TEST_F(DriveCacheTest, DirtyCachePinned) {
// Clear dirty state of the file.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_OK,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1191,9 +1191,9 @@ TEST_F(DriveCacheTest, PinAndUnpinDirtyCache) {
// First store a file to cache and mark it as dirty.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1208,7 +1208,7 @@ TEST_F(DriveCacheTest, PinAndUnpinDirtyCache) {
EXPECT_TRUE(file_util::PathExists(dirty_path));
// Pin the dirty file.
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PINNED |
@@ -1219,7 +1219,7 @@ TEST_F(DriveCacheTest, PinAndUnpinDirtyCache) {
EXPECT_TRUE(file_util::PathExists(dirty_path));
// Unpin the dirty file.
- TestUnpin(resource_id, md5, GDATA_FILE_OK,
+ TestUnpin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1239,12 +1239,12 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// First store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Mark the file dirty.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1253,7 +1253,7 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Again, mark the file dirty. Nothing should change.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1262,7 +1262,7 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Commit the file dirty. Outgoing symlink should be created.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1271,7 +1271,7 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Again, commit the file dirty. Nothing should change.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1281,7 +1281,7 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Mark the file dirty agian after it's being committed. Outgoing symlink
// should be deleted.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1290,7 +1290,7 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Commit the file dirty. Outgoing symlink should be created again.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1299,14 +1299,14 @@ TEST_F(DriveCacheTest, DirtyCacheRepetitive) {
// Clear dirty state of the file.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_OK,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Again, clear dirty state of the file, which is no longer dirty.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_ERROR_INVALID_OPERATION,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_ERROR_INVALID_OPERATION,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -1321,47 +1321,47 @@ TEST_F(DriveCacheTest, DirtyCacheInvalid) {
// Mark a non-existent file dirty.
num_callback_invocations_ = 0;
- TestMarkDirty(resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Commit a non-existent file dirty.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Clear dirty state of a non-existent file.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_ERROR_NOT_FOUND,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_ERROR_NOT_FOUND,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Store a file to cache.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Commit a non-dirty existing file dirty.
num_callback_invocations_ = 0;
- TestCommitDirty(resource_id, md5, GDATA_FILE_ERROR_INVALID_OPERATION,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_ERROR_INVALID_OPERATION,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Clear dirty state of a non-dirty existing file.
num_callback_invocations_ = 0;
- TestClearDirty(resource_id, md5, GDATA_FILE_ERROR_INVALID_OPERATION,
+ TestClearDirty(resource_id, md5, DRIVE_FILE_ERROR_INVALID_OPERATION,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
// Mark an existing file dirty, then store a new file to the same resource id
// but different md5, which should fail.
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1369,7 +1369,7 @@ TEST_F(DriveCacheTest, DirtyCacheInvalid) {
num_callback_invocations_ = 0;
md5 = "new_md5";
TestStoreToCache(resource_id, md5, GetTestFilePath("subdir_feed.json"),
- GDATA_FILE_ERROR_IN_USE,
+ DRIVE_FILE_ERROR_IN_USE,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1388,20 +1388,20 @@ TEST_F(DriveCacheTest, RemoveFromDirtyCache) {
// Store a file to cache, pin it, mark it dirty and commit it.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
- TestPin(resource_id, md5, GDATA_FILE_OK,
+ TestPin(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_PERSISTENT,
DriveCache::CACHE_TYPE_PERSISTENT);
- TestMarkDirty(resource_id, md5, GDATA_FILE_OK,
+ TestMarkDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_DIRTY |
test_util::TEST_CACHE_STATE_PERSISTENT,
DriveCache::CACHE_TYPE_PERSISTENT);
- TestCommitDirty(resource_id, md5, GDATA_FILE_OK,
+ TestCommitDirty(resource_id, md5, DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_PINNED |
test_util::TEST_CACHE_STATE_DIRTY |
@@ -1411,7 +1411,7 @@ TEST_F(DriveCacheTest, RemoveFromDirtyCache) {
// Try to remove the file. Since file is dirty, it and the corresponding
// pinned and outgoing symlinks should not be removed.
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -1425,7 +1425,7 @@ TEST_F(DriveCacheTest, MountUnmount) {
// First store a file to cache in the tmp subdir.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
// Mark the file mounted.
@@ -1434,7 +1434,7 @@ TEST_F(DriveCacheTest, MountUnmount) {
DriveCache::CACHE_TYPE_TMP,
DriveCache::CACHED_FILE_FROM_SERVER);
TestSetMountedState(resource_id, md5, file_path, true,
- GDATA_FILE_OK,
+ DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT |
test_util::TEST_CACHE_STATE_MOUNTED |
test_util::TEST_CACHE_STATE_PERSISTENT,
@@ -1449,7 +1449,7 @@ TEST_F(DriveCacheTest, MountUnmount) {
DriveCache::CACHE_TYPE_PERSISTENT,
DriveCache::CACHED_FILE_MOUNTED);
TestSetMountedState(resource_id, md5, file_path, false,
- GDATA_FILE_OK,
+ DRIVE_FILE_OK,
test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -1457,7 +1457,7 @@ TEST_F(DriveCacheTest, MountUnmount) {
// Try to remove the file.
num_callback_invocations_ = 0;
- TestRemoveFromCache(resource_id, GDATA_FILE_OK);
+ TestRemoveFromCache(resource_id, DRIVE_FILE_OK);
EXPECT_EQ(1, num_callback_invocations_);
}
@@ -1524,7 +1524,7 @@ TEST_F(DriveCacheTest, ClearAllOnUIThread) {
// Store an existing file.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
+ DRIVE_FILE_OK, test_util::TEST_CACHE_STATE_PRESENT,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
@@ -1532,13 +1532,13 @@ TEST_F(DriveCacheTest, ClearAllOnUIThread) {
EXPECT_EQ(1U, CountCacheFiles(resource_id, md5));
// Clear cache.
- GDataFileError error = GDATA_FILE_OK;
+ DriveFileError error = DRIVE_FILE_OK;
FilePath file_path;
cache_->ClearAllOnUIThread(base::Bind(&OnClearAll,
&error,
&file_path));
test_util::RunBlockingPoolTask();
- EXPECT_EQ(GDATA_FILE_OK, error);
+ EXPECT_EQ(DRIVE_FILE_OK, error);
// Verify that all the cache is removed.
VerifyRemoveFromCache(error, resource_id, md5);
@@ -1554,7 +1554,7 @@ TEST_F(DriveCacheTest, StoreToCacheNoSpace) {
// Try to store an existing file.
TestStoreToCache(resource_id, md5, GetTestFilePath("root_feed.json"),
- GDATA_FILE_ERROR_NO_SPACE,
+ DRIVE_FILE_ERROR_NO_SPACE,
test_util::TEST_CACHE_STATE_NONE,
DriveCache::CACHE_TYPE_TMP);
EXPECT_EQ(1, num_callback_invocations_);
« no previous file with comments | « chrome/browser/chromeos/gdata/drive_cache.cc ('k') | chrome/browser/chromeos/gdata/drive_errorcode.h » ('j') | chrome/browser/chromeos/gdata/gdata_contacts_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698