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

Unified Diff: chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc

Issue 276313002: drive: Change FileCache::GetCacheEntry's return type to FileError (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
diff --git a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
index 458dfb203ee5fa49c71417e6a0eefc6bd41de985..241294c626bdfe869f3836b7c36237d119e0cb1c 100644
--- a/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc
@@ -235,7 +235,6 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdate) {
server_entry->file_size());
// Make sure that the cache is no longer dirty.
- bool success = false;
FileCacheEntry cache_entry;
base::PostTaskAndReplyWithResult(
blocking_task_runner(),
@@ -244,9 +243,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdate) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- ASSERT_TRUE(success);
+ ASSERT_EQ(FILE_ERROR_OK, error);
EXPECT_FALSE(cache_entry.is_dirty());
}
@@ -289,7 +288,6 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
server_entry->file_size());
// Make sure that the cache is no longer dirty.
- bool success = false;
FileCacheEntry cache_entry;
base::PostTaskAndReplyWithResult(
blocking_task_runner(),
@@ -298,9 +296,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- ASSERT_TRUE(success);
+ ASSERT_EQ(FILE_ERROR_OK, error);
EXPECT_FALSE(cache_entry.is_dirty());
// Again mark the cache file dirty.
@@ -334,7 +332,6 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
fake_service()->about_resource().largest_change_id());
// Make sure that the cache is no longer dirty.
- success = false;
base::PostTaskAndReplyWithResult(
blocking_task_runner(),
FROM_HERE,
@@ -342,9 +339,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- ASSERT_TRUE(success);
+ ASSERT_EQ(FILE_ERROR_OK, error);
EXPECT_FALSE(cache_entry.is_dirty());
}
@@ -382,7 +379,6 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_OpenedForWrite) {
EXPECT_EQ(FILE_ERROR_OK, error);
// Make sure that the cache is still dirty.
- bool success = false;
FileCacheEntry cache_entry;
base::PostTaskAndReplyWithResult(
blocking_task_runner(),
@@ -391,9 +387,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_OpenedForWrite) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- EXPECT_TRUE(success);
+ EXPECT_EQ(FILE_ERROR_OK, error);
EXPECT_TRUE(cache_entry.is_dirty());
// Close the file.
@@ -416,9 +412,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_OpenedForWrite) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- EXPECT_TRUE(success);
+ EXPECT_EQ(FILE_ERROR_OK, error);
EXPECT_FALSE(cache_entry.is_dirty());
}
@@ -463,7 +459,6 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_UploadNewFile) {
EXPECT_EQ(ResourceEntry::CLEAN, entry.metadata_edit_state());
// Make sure that the cache is no longer dirty.
- bool success = false;
FileCacheEntry cache_entry;
base::PostTaskAndReplyWithResult(
blocking_task_runner(),
@@ -472,9 +467,9 @@ TEST_F(EntryUpdatePerformerTest, UpdateEntry_UploadNewFile) {
base::Unretained(cache()),
local_id,
&cache_entry),
- google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();
- EXPECT_TRUE(success);
+ EXPECT_EQ(FILE_ERROR_OK, error);
EXPECT_FALSE(cache_entry.is_dirty());
// Make sure that we really created a file.
« no previous file with comments | « chrome/browser/chromeos/drive/sync/entry_update_performer.cc ('k') | chrome/browser/chromeos/drive/sync_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698