drive: Make CopyOperation aware of locally created files

chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc

Index: chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
index ae21a664e6242879216377a7249e77f63fe9b8ff..755990af76cbf6525a3cc103c6c10286272b67c5 100644
--- a/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/move_operation_unittest.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/browser/chromeos/drive/file_system/move_operation.h"
 
-#include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
-#include "chrome/browser/drive/drive_api_util.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,17 +18,9 @@ class MoveOperationTest : public OperationTestBase {
    operation_.reset(new MoveOperation(blocking_task_runner(),
                                       observer(),
                                       metadata()));
-   copy_operation_.reset(new CopyOperation(
-       blocking_task_runner(),
-       observer(),
-       scheduler(),
-       metadata(),
-       cache(),
-       util::GetIdentityResourceIdCanonicalizer()));
   }
 
   scoped_ptr<MoveOperation> operation_;
-  scoped_ptr<CopyOperation> copy_operation_;
 };
 
 TEST_F(MoveOperationTest, MoveFileInSameDirectory) {
@@ -95,57 +85,6 @@ TEST_F(MoveOperationTest, MoveFileFromRootToSubDirectory) {
   EXPECT_TRUE(observer()->updated_local_ids().count(src_entry.local_id()));
 }
 
-TEST_F(MoveOperationTest, MoveFileBetweenSubDirectoriesRenameWithTitle) {
-  base::FilePath src_path(
-      FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1.txt"));
-  base::FilePath dest_path(FILE_PATH_LITERAL(
-      "drive/root/Directory 1/Sub Directory Folder/"
-      "SubDirectory File 1 (1).txt"));
-
-  ResourceEntry src_entry, dest_entry;
-  ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(src_path, &src_entry));
-  ASSERT_EQ(FILE_ERROR_NOT_FOUND,
-            GetLocalResourceEntry(dest_path, &dest_entry));
-
-  FileError error = FILE_ERROR_FAILED;
-  // Copy the src file into the same directory. This will make inconsistency
-  // between title and path of the copied file.
-  copy_operation_->Copy(
-      src_path,
-      src_path,
-      false,
-      google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
-  EXPECT_EQ(FILE_ERROR_OK, error);
-  base::FilePath copied_path(
-      FILE_PATH_LITERAL("drive/root/Directory 1/SubDirectory File 1 (1).txt"));
-  ResourceEntry copied_entry;
-  ASSERT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(copied_path, &copied_entry));
-  ASSERT_EQ("SubDirectory File 1.txt", copied_entry.title());
-
-  // Move the copied file.
-  operation_->Move(copied_path,
-                   dest_path,
-                   false,
-                   google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
-  EXPECT_EQ(FILE_ERROR_OK, error);
-
-  EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &dest_entry));
-  EXPECT_EQ("SubDirectory File 1 (1).txt", dest_entry.title());
-  EXPECT_EQ(copied_entry.local_id(), dest_entry.local_id());
-  EXPECT_EQ(ResourceEntry::DIRTY, dest_entry.metadata_edit_state());
-  EXPECT_EQ(FILE_ERROR_NOT_FOUND,
-            GetLocalResourceEntry(copied_path, &copied_entry));
-
-  EXPECT_EQ(2U, observer()->get_changed_paths().size());
-  EXPECT_TRUE(observer()->get_changed_paths().count(copied_path.DirName()));
-  EXPECT_TRUE(observer()->get_changed_paths().count(dest_path.DirName()));
-
-  EXPECT_EQ(1U, observer()->updated_local_ids().size());
-  EXPECT_TRUE(observer()->updated_local_ids().count(copied_entry.local_id()));
-}
-
 TEST_F(MoveOperationTest, MoveNotExistingFile) {
   base::FilePath src_path(FILE_PATH_LITERAL("drive/root/Dummy file.txt"));
   base::FilePath dest_path(FILE_PATH_LITERAL("drive/root/Test.log"));