drive: Deal with the root directory in the same way as others in MoveOperation.

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/drive_scheduler.h"
@@ skipping 70 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.

[kinaba, 2013/01/21 08:24:29]

A note:
Strictly speaking, this is false. Removing from its parent does not move the
file to the root; just make it orphaned (in drive.google.com and Drive clients
in Win/Mac). However, since all the rest of our code is treating orphaned files
as root files, this is still true in our code. In the future we should match it
up with other clients: crbug/171207.

[satorux1, 2013/01/22 06:51:50]

Could you update the comment?

[kinaba, 2013/01/22 07:09:10]

Done.

   // 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|.
   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