Rename OperationObserver to OperationDelegate

chrome/browser/chromeos/drive/file_system/copy_operation_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/file_system/copy_operation.h"
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
@@ skipping 23 matching lines @@
 }
 
 }  // namespace
 
 class CopyOperationTest : public OperationTestBase {
  protected:
   virtual void SetUp() OVERRIDE {
    OperationTestBase::SetUp();
    operation_.reset(new CopyOperation(
        blocking_task_runner(),
-       observer(),
+       delegate(),
        scheduler(),
        metadata(),
        cache(),
        util::GetIdentityResourceIdCanonicalizer()));
   }
 
   scoped_ptr<CopyOperation> operation_;
 };
 
 TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_RegularFile) {
@@ skipping 14 matching lines @@
   operation_->TransferFileFromLocalToRemote(
       local_src_path,
       remote_dest_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // TransferFileFromLocalToRemote stores a copy of the local file in the cache,
   // marks it dirty and requests the observer to upload the file.
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
-  EXPECT_EQ(1U, observer()->updated_local_ids().count(entry.local_id()));
+  EXPECT_EQ(1U, delegate()->updated_local_ids().count(entry.local_id()));
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_present());
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_dirty());
 
-  EXPECT_EQ(1U, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(remote_dest_path));
+  EXPECT_EQ(1U, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
 }
 
 TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_Overwrite) {
   const base::FilePath local_src_path = temp_dir().AppendASCII("local.txt");
   const base::FilePath remote_dest_path(
       FILE_PATH_LITERAL("drive/root/File 1.txt"));
 
   // Prepare a local file.
   EXPECT_TRUE(
       google_apis::test_util::WriteStringToFile(local_src_path, "hello"));
   // Confirm that the remote file exists.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
 
   // Transfer the local file to Drive.
   FileError error = FILE_ERROR_FAILED;
   operation_->TransferFileFromLocalToRemote(
       local_src_path,
       remote_dest_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // TransferFileFromLocalToRemote stores a copy of the local file in the cache,
   // marks it dirty and requests the observer to upload the file.
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
-  EXPECT_EQ(1U, observer()->updated_local_ids().count(entry.local_id()));
+  EXPECT_EQ(1U, delegate()->updated_local_ids().count(entry.local_id()));
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_present());
   EXPECT_TRUE(entry.file_specific_info().cache_state().is_dirty());
 
-  EXPECT_EQ(1U, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(remote_dest_path));
+  EXPECT_EQ(1U, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
 }
 
 TEST_F(CopyOperationTest,
        TransferFileFromLocalToRemote_ExistingHostedDocument) {
   const base::FilePath local_src_path = temp_dir().AppendASCII("local.gdoc");
   const base::FilePath remote_dest_path(FILE_PATH_LITERAL(
       "drive/root/Directory 1/copied.gdoc"));
 
   // Prepare a local file, which is a json file of a hosted document, which
   // matches "drive/root/Document 1 excludeDir-test".
@@ skipping 10 matching lines @@
   FileError error = FILE_ERROR_FAILED;
   operation_->TransferFileFromLocalToRemote(
       local_src_path,
       remote_dest_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
 
-  EXPECT_EQ(1U, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(remote_dest_path));
+  EXPECT_EQ(1U, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
   // New copy is created.
   EXPECT_NE("document:5_document_resource_id", entry.resource_id());
 }
 
 TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_OrphanHostedDocument) {
   const base::FilePath local_src_path = temp_dir().AppendASCII("local.gdoc");
   const base::FilePath remote_dest_path(FILE_PATH_LITERAL(
       "drive/root/Directory 1/moved.gdoc"));
 
   // Prepare a local file, which is a json file of a hosted document, which
@@ skipping 11 matching lines @@
   FileError error = FILE_ERROR_FAILED;
   operation_->TransferFileFromLocalToRemote(
       local_src_path,
       remote_dest_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
   EXPECT_EQ(ResourceEntry::DIRTY, entry.metadata_edit_state());
-  EXPECT_TRUE(observer()->updated_local_ids().count(entry.local_id()));
+  EXPECT_TRUE(delegate()->updated_local_ids().count(entry.local_id()));
 
-  EXPECT_EQ(1U, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(remote_dest_path));
+  EXPECT_EQ(1U, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
   // The original document got new parent.
   EXPECT_EQ("document:orphan_doc_1", entry.resource_id());
 }
 
 TEST_F(CopyOperationTest, TransferFileFromLocalToRemote_NewHostedDocument) {
   const base::FilePath local_src_path = temp_dir().AppendASCII("local.gdoc");
   const base::FilePath remote_dest_path(FILE_PATH_LITERAL(
       "drive/root/Directory 1/moved.gdoc"));
 
   // Create a hosted document on the server that is not synced to local yet.
@@ skipping 20 matching lines @@
   FileError error = FILE_ERROR_FAILED;
   operation_->TransferFileFromLocalToRemote(
       local_src_path,
       remote_dest_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(remote_dest_path, &entry));
 
-  EXPECT_EQ(1U, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(remote_dest_path));
+  EXPECT_EQ(1U, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(remote_dest_path));
   // The original document got new parent.
   EXPECT_EQ(new_gdoc_entry->file_id(), entry.resource_id());
 }
 
 TEST_F(CopyOperationTest, CopyNotExistingFile) {
   base::FilePath src_path(FILE_PATH_LITERAL("drive/root/Dummy file.txt"));
   base::FilePath dest_path(FILE_PATH_LITERAL("drive/root/Test.log"));
 
   ResourceEntry entry;
   ASSERT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(src_path, &entry));
 
   FileError error = FILE_ERROR_OK;
   operation_->Copy(src_path,
                    dest_path,
                    false,
                    google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
 
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(src_path, &entry));
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(dest_path, &entry));
-  EXPECT_TRUE(observer()->get_changed_files().empty());
+  EXPECT_TRUE(delegate()->get_changed_files().empty());
 }
 
 TEST_F(CopyOperationTest, CopyFileToNonExistingDirectory) {
   base::FilePath src_path(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   base::FilePath dest_path(FILE_PATH_LITERAL("drive/root/Dummy/Test.log"));
 
   ResourceEntry entry;
   ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));
   ASSERT_EQ(FILE_ERROR_NOT_FOUND,
             GetLocalResourceEntry(dest_path.DirName(), &entry));
 
   FileError error = FILE_ERROR_OK;
   operation_->Copy(src_path,
                    dest_path,
                    false,
                    google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
 
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(dest_path, &entry));
-  EXPECT_TRUE(observer()->get_changed_files().empty());
+  EXPECT_TRUE(delegate()->get_changed_files().empty());
 }
 
 // Test the case where the parent of the destination path is an existing file,
 // not a directory.
 TEST_F(CopyOperationTest, CopyFileToInvalidPath) {
   base::FilePath src_path(FILE_PATH_LITERAL(
       "drive/root/Document 1 excludeDir-test.gdoc"));
   base::FilePath dest_path(FILE_PATH_LITERAL(
       "drive/root/Duplicate Name.txt/Document 1 excludeDir-test.gdoc"));
 
   ResourceEntry entry;
   ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));
   ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path.DirName(), &entry));
   ASSERT_FALSE(entry.file_info().is_directory());
 
   FileError error = FILE_ERROR_OK;
   operation_->Copy(src_path,
                    dest_path,
                    false,
                    google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY, error);
 
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &entry));
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(dest_path, &entry));
-  EXPECT_TRUE(observer()->get_changed_files().empty());
+  EXPECT_TRUE(delegate()->get_changed_files().empty());
 }
 
 TEST_F(CopyOperationTest, CopyDirtyFile) {
   base::FilePath src_path(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   base::FilePath dest_path(FILE_PATH_LITERAL(
       "drive/root/Directory 1/New File.txt"));
 
   ResourceEntry src_entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &src_entry));
 
@@ skipping 21 matching lines @@
                    dest_path,
                    false,
                    google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   ResourceEntry dest_entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &dest_entry));
   EXPECT_EQ(ResourceEntry::DIRTY, dest_entry.metadata_edit_state());
 
-  EXPECT_EQ(1u, observer()->updated_local_ids().size());
-  EXPECT_TRUE(observer()->updated_local_ids().count(dest_entry.local_id()));
-  EXPECT_EQ(1u, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(dest_path));
+  EXPECT_EQ(1u, delegate()->updated_local_ids().size());
+  EXPECT_TRUE(delegate()->updated_local_ids().count(dest_entry.local_id()));
+  EXPECT_EQ(1u, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(dest_path));
 
   // Copied cache file should be dirty.
   EXPECT_TRUE(dest_entry.file_specific_info().cache_state().is_dirty());
 
   // File contents should match.
   base::FilePath cache_file_path;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner(),
       FROM_HERE,
       base::Bind(&internal::FileCache::GetFile,
@@ skipping 21 matching lines @@
   operation_->Copy(src_path,
                    dest_path,
                    false,
                    google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   ResourceEntry new_dest_entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &new_dest_entry));
 
-  EXPECT_EQ(1u, observer()->updated_local_ids().size());
-  EXPECT_TRUE(observer()->updated_local_ids().count(old_dest_entry.local_id()));
-  EXPECT_EQ(1u, observer()->get_changed_files().size());
-  EXPECT_TRUE(observer()->get_changed_files().count(dest_path));
+  EXPECT_EQ(1u, delegate()->updated_local_ids().size());
+  EXPECT_TRUE(delegate()->updated_local_ids().count(old_dest_entry.local_id()));
+  EXPECT_EQ(1u, delegate()->get_changed_files().size());
+  EXPECT_TRUE(delegate()->get_changed_files().count(dest_path));
 }
 
 TEST_F(CopyOperationTest, CopyFileOverwriteDirectory) {
   base::FilePath src_path(FILE_PATH_LITERAL("drive/root/File 1.txt"));
   base::FilePath dest_path(FILE_PATH_LITERAL("drive/root/Directory 1"));
 
   FileError error = FILE_ERROR_OK;
   operation_->Copy(src_path,
                    dest_path,
                    false,
@@ skipping 69 matching lines @@
       base::Bind(&internal::ResourceMetadata::AddEntry,
                  base::Unretained(metadata()), directory, &directory_local_id),
       google_apis::test_util::CreateCopyResultCallback(&error));
   content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Try to copy a file to the new directory which lacks resource ID.
   // This should result in waiting for the directory to sync.
   std::string waited_local_id;
   FileOperationCallback pending_callback;
-  observer()->set_wait_for_sync_complete_handler(
+  delegate()->set_wait_for_sync_complete_handler(
       base::Bind(&CopyWaitForSyncCompleteArguments,
                  &waited_local_id, &pending_callback));
 
   FileError copy_error = FILE_ERROR_FAILED;
   operation_->Copy(src_path,
                    dest_path,
                    true,  // Preserve last modified.
                    google_apis::test_util::CreateCopyResultCallback(
                        &copy_error));
   content::RunAllBlockingPoolTasksUntilIdle();
@@ skipping 28 matching lines @@
   pending_callback.Run(FILE_ERROR_OK);
   content::RunAllBlockingPoolTasksUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_OK, copy_error);
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &entry));
 }
 
 }  // namespace file_system
 }  // namespace drive