Merge 177997

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

 // Copyright (c) 2012 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/move_operation.h"
 
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_cache.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
@@ skipping 67 matching lines @@
 
     Rename(src_file_path, dest_file_path.BaseName().value(),
            final_file_path_update_callback);
     return;
   }
 
   // Otherwise, the move operation involves three steps:
   // 1. Renames the file at |src_file_path| to basename(|dest_file_path|)
   //    within the same directory. The rename operation is a no-op if
   //    basename(|src_file_path|) equals to basename(|dest_file_path|).
-  // 2. Removes the file from its parent directory (the file is not deleted),
-  //    which effectively moves the file to the root directory.
-  // 3. Adds the file to the parent directory of |dest_file_path|, which
-  //    effectively moves the file from the root directory to the parent
-  //    directory of |dest_file_path|.
+  // 2. Removes the file from its parent directory (the file is not deleted, but
+  //    just becomes orphaned).
+  // 3. Adds the file to the parent directory of |dest_file_path|.
+  //
+  // TODO(kinaba): After the step 2, the file gets into the state with no parent
+  // node. Our current implementation regards the state as belonging to the root
+  // directory, so below the file is dealt as such. In fact, this is not the
+  // case on the server side. No-parent and in-root is a different concept. We
+  // need to make our implementation consistent to the server: crbug.com/171207.
   const FileMoveCallback add_file_to_directory_callback =
-      base::Bind(&MoveOperation::MoveEntryFromRootDirectory,
+      base::Bind(&MoveOperation::AddEntryToDirectory,
                  weak_ptr_factory_.GetWeakPtr(),
                  dest_parent_path,
                  callback);
 
   const FileMoveCallback remove_file_from_directory_callback =
-      base::Bind(&MoveOperation::RemoveEntryFromNonRootDirectory,
+      base::Bind(&MoveOperation::RemoveEntryFromDirectory,
                  weak_ptr_factory_.GetWeakPtr(),
                  add_file_to_directory_callback);
 
   Rename(src_file_path, dest_file_path.BaseName().value(),
          remove_file_from_directory_callback);
 }
 
 void MoveOperation::OnFilePathUpdated(const FileOperationCallback& callback,
                                         DriveFileError error,
                                         const FilePath& /* file_path */) {
@@ skipping 86 matching lines @@
   }
 
   metadata_->RenameEntry(
       file_path,
       new_name,
       base::Bind(&MoveOperation::NotifyAndRunFileMoveCallback,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
-void MoveOperation::RemoveEntryFromNonRootDirectory(
+void MoveOperation::RemoveEntryFromDirectory(
     const FileMoveCallback& callback,
     DriveFileError error,
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  const FilePath dir_path = file_path.DirName();
-  // Return if there is an error or |dir_path| is the root directory.
-  if (error != DRIVE_FILE_OK || dir_path == FilePath(kDriveRootDirectory)) {
-    callback.Run(error, file_path);
-    return;
-  }
-
   metadata_->GetEntryInfoPairByPaths(
       file_path,
-      dir_path,
+      file_path.DirName(),
       base::Bind(
-          &MoveOperation::RemoveEntryFromNonRootDirectoryAfterEntryInfoPair,
+          &MoveOperation::RemoveEntryFromDirectoryAfterEntryInfoPair,
           weak_ptr_factory_.GetWeakPtr(),
           callback));
 }
 
-void MoveOperation::RemoveEntryFromNonRootDirectoryAfterEntryInfoPair(
+void MoveOperation::RemoveEntryFromDirectoryAfterEntryInfoPair(
     const FileMoveCallback& callback,
     scoped_ptr<EntryInfoPairResult> result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
   DCHECK(result.get());
 
   const FilePath& file_path = result->first.path;
   if (result->first.error != DRIVE_FILE_OK) {
     callback.Run(result->first.error, file_path);
     return;
@@ skipping 18 matching lines @@
                  weak_ptr_factory_.GetWeakPtr(),
                  file_path,
                  FilePath(kDriveRootDirectory),
                  base::Bind(&MoveOperation::NotifyAndRunFileMoveCallback,
                             weak_ptr_factory_.GetWeakPtr(),
                             callback)));
 }
 
 // TODO(zork): Share with CopyOperation.
 // See: crbug.com/150050
-void MoveOperation::MoveEntryFromRootDirectory(
-    const FilePath& directory_path,
-    const FileOperationCallback& callback,
-    DriveFileError error,
-    const FilePath& file_path) {
+void MoveOperation::AddEntryToDirectory(const FilePath& directory_path,
+                                        const FileOperationCallback& callback,
+                                        DriveFileError error,
+                                        const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
-  DCHECK_EQ(kDriveRootDirectory, file_path.DirName().value());
-
-  // Return if there is an error or |dir_path| is the root directory.
-  if (error != DRIVE_FILE_OK ||
-      directory_path == FilePath(kDriveRootDirectory)) {
-    callback.Run(error);
-    return;
-  }
 
   metadata_->GetEntryInfoPairByPaths(
       file_path,
       directory_path,
       base::Bind(
-          &MoveOperation::MoveEntryFromRootDirectoryAfterGetEntryInfoPair,
+          &MoveOperation::AddEntryToDirectoryAfterGetEntryInfoPair,
           weak_ptr_factory_.GetWeakPtr(),
           callback));
 }
 
 // TODO(zork): Share with CopyOperation.
 // See: crbug.com/150050
-void MoveOperation::MoveEntryFromRootDirectoryAfterGetEntryInfoPair(
+void MoveOperation::AddEntryToDirectoryAfterGetEntryInfoPair(
     const FileOperationCallback& callback,
     scoped_ptr<EntryInfoPairResult> result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
   DCHECK(result.get());
 
   if (result->first.error != DRIVE_FILE_OK) {
     callback.Run(result->first.error);
     return;
   } else if (result->second.error != DRIVE_FILE_OK) {
@@ skipping 65 matching lines @@
   DCHECK(!callback.is_null());
 
   if (error == DRIVE_FILE_OK)
     observer_->OnDirectoryChangedByOperation(moved_file_path.DirName());
 
   callback.Run(error, moved_file_path);
 }
 
 }  // namespace file_system
 }  // namespace drive