drive: Change FileCache::GetCacheEntry's return type to FileError

chrome/browser/chromeos/drive/sync/entry_update_performer_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
 
 #include "base/callback_helpers.h"
 #include "base/file_util.h"
 #include "base/md5.h"
 #include "base/task_runner_util.h"
@@ skipping 217 matching lines @@
   fake_service()->GetResourceEntry(
       kResourceId,
       google_apis::test_util::CreateCopyResultCallback(&gdata_error,
                                                        &server_entry));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(google_apis::HTTP_SUCCESS, gdata_error);
   EXPECT_EQ(static_cast<int64>(kTestFileContent.size()),
             server_entry->file_size());
 
   // Make sure that the cache is no longer dirty.
-  bool success = false;
   FileCacheEntry cache_entry;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&FileCache::GetCacheEntry,
                  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());
 }
 
 TEST_F(EntryUpdatePerformerTest, UpdateEntry_ContentUpdateMd5Check) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   const std::string kResourceId("file:2_file_resource_id");
 
   const std::string local_id = GetLocalId(kFilePath);
   EXPECT_FALSE(local_id.empty());
 
@@ skipping 22 matching lines @@
   fake_service()->GetResourceEntry(
       kResourceId,
       google_apis::test_util::CreateCopyResultCallback(&gdata_error,
                                                        &server_entry));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(google_apis::HTTP_SUCCESS, gdata_error);
   EXPECT_EQ(static_cast<int64>(kTestFileContent.size()),
             server_entry->file_size());
 
   // Make sure that the cache is no longer dirty.
-  bool success = false;
   FileCacheEntry cache_entry;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&FileCache::GetCacheEntry,
                  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.
   scoped_ptr<base::ScopedClosureRunner> file_closer;
   error = FILE_ERROR_FAILED;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&FileCache::OpenForWrite,
                  base::Unretained(cache()),
@@ skipping 13 matching lines @@
       local_id,
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   EXPECT_EQ(original_changestamp,
             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,
       base::Bind(&FileCache::GetCacheEntry,
                  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());
 }
 
 TEST_F(EntryUpdatePerformerTest, UpdateEntry_OpenedForWrite) {
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   const std::string kResourceId("file:2_file_resource_id");
 
   const std::string local_id = GetLocalId(kFilePath);
   EXPECT_FALSE(local_id.empty());
 
@@ skipping 17 matching lines @@
   // Update. This should not clear the dirty bit.
   error = FILE_ERROR_FAILED;
   performer_->UpdateEntry(
       local_id,
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   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(),
       FROM_HERE,
       base::Bind(&FileCache::GetCacheEntry,
                  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.
   file_closer.reset();
 
   // Update. This should clear the dirty bit.
   error = FILE_ERROR_FAILED;
   performer_->UpdateEntry(
       local_id,
       ClientContext(USER_INITIATED),
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Make sure that the cache is no longer dirty.
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&FileCache::GetCacheEntry,
                  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());
 }
 
 TEST_F(EntryUpdatePerformerTest, UpdateEntry_UploadNewFile) {
   // Create a new file locally.
   const base::FilePath kFilePath(FILE_PATH_LITERAL("drive/root/New File.txt"));
 
   ResourceEntry parent;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(kFilePath.DirName(), &parent));
 
@@ skipping 24 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(&error));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // The entry got a resource ID.
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(kFilePath, &entry));
   EXPECT_FALSE(entry.resource_id().empty());
   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(),
       FROM_HERE,
       base::Bind(&FileCache::GetCacheEntry,
                  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.
   google_apis::GDataErrorCode status = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> resource_entry;
   fake_service()->GetResourceEntry(
       entry.resource_id(),
       google_apis::test_util::CreateCopyResultCallback(&status,
                                                        &resource_entry));
   test_util::RunBlockingPoolTask();
@@ skipping 124 matching lines @@
       google_apis::test_util::CreateCopyResultCallback(&status,
                                                        &resource_entry));
   test_util::RunBlockingPoolTask();
   EXPECT_EQ(google_apis::HTTP_SUCCESS, status);
   ASSERT_TRUE(resource_entry);
   EXPECT_TRUE(resource_entry->is_folder());
 }
 
 }  // namespace internal
 }  // namespace drive