gdata: Rename AddEntryToDirectory() to MoveEntryFromRootDirectory()

chrome/browser/chromeos/gdata/gdata_file_system.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/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 1193 matching lines @@
   // 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|.
   FileMoveCallback add_file_to_directory_callback =
-      base::Bind(&GDataFileSystem::AddEntryToDirectory,
+      base::Bind(&GDataFileSystem::MoveEntryFromRootDirectory,
                  ui_weak_ptr_,
                  dest_file_path.DirName(),
                  callback);
 
   FileMoveCallback remove_file_from_directory_callback =
       base::Bind(&GDataFileSystem::RemoveEntryFromDirectory,
                  ui_weak_ptr_,
                  src_file_path.DirName(),
                  add_file_to_directory_callback);
 
   Rename(src_file_path, dest_file_path.BaseName().value(),
          remove_file_from_directory_callback);
 }
 
-void GDataFileSystem::AddEntryToDirectory(
+void GDataFileSystem::MoveEntryFromRootDirectory(
     const FilePath& dir_path,
     const FileOperationCallback& callback,
     GDataFileError error,
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+  DCHECK_EQ(kGDataRootDirectory, file_path.DirName().value());
 
   GDataEntry* entry = directory_service_->FindEntryByPathSync(file_path);
   GDataEntry* dir_entry = directory_service_->FindEntryByPathSync(dir_path);
   if (error == GDATA_FILE_OK) {
     if (!entry || !dir_entry) {
       error = GDATA_FILE_ERROR_NOT_FOUND;
     } else {
       if (!dir_entry->AsGDataDirectory())
         error = GDATA_FILE_ERROR_NOT_A_DIRECTORY;
     }
   }
 
   // Returns if there is an error or |dir_path| is the root directory.
   if (error != GDATA_FILE_OK ||
       dir_entry->resource_id() == kGDataRootDirectoryResourceId) {
-    if (!callback.is_null())
-      MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, error));
-
+    callback.Run(error);
     return;
   }
 
   documents_service_->AddResourceToDirectory(
       dir_entry->content_url(),
       entry->edit_url(),
-      base::Bind(&GDataFileSystem::OnAddEntryToDirectoryCompleted,
+      base::Bind(&GDataFileSystem::OnMoveEntryFromRootDirectoryCompleted,
                  ui_weak_ptr_,
                  callback,
                  file_path,
                  dir_path));
 }
 
 void GDataFileSystem::RemoveEntryFromDirectory(
     const FilePath& dir_path,
     const FileMoveCallback& callback,
     GDataFileError error,
@@ skipping 1212 matching lines @@
 
   GDataEntry* entry = GDataEntry::FromDocumentEntry(
       NULL, doc_entry.get(), directory_service_.get());
   if (!entry) {
     callback.Run(GDATA_FILE_ERROR_FAILED);
     return;
   }
 
   // |entry| was added in the root directory on the server, so we should
   // first add it to |root_| to mirror the state and then move it to the
-  // destination directory by AddEntryToDirectory().
+  // destination directory by MoveEntryFromRootDirectory().
   directory_service_->root()->AddEntry(entry);
-  AddEntryToDirectory(dir_path, callback, GDATA_FILE_OK, entry->GetFilePath());
+  MoveEntryFromRootDirectory(dir_path,
+                             callback,
+                             GDATA_FILE_OK,
+                             entry->GetFilePath());
 }
 
-void GDataFileSystem::OnAddEntryToDirectoryCompleted(
+void GDataFileSystem::OnMoveEntryFromRootDirectoryCompleted(
     const FileOperationCallback& callback,
     const FilePath& file_path,
     const FilePath& dir_path,
     GDataErrorCode status,
     const GURL& document_url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
 
   GDataFileError error = util::GDataToGDataFileError(status);
   if (error == GDATA_FILE_OK) {
     GDataEntry* entry = directory_service_->FindEntryByPathSync(file_path);
     if (entry) {
       DCHECK_EQ(directory_service_->root(), entry->parent());
       directory_service_->MoveEntryToDirectory(dir_path, entry,
           base::Bind(
               &GDataFileSystem::OnMoveEntryToDirectoryWithFileOperationCallback,
               ui_weak_ptr_,
               callback));
       return;
     } else {
       error = GDATA_FILE_ERROR_NOT_FOUND;
     }
   }
 
-  if (!callback.is_null())
-    callback.Run(error);
+  callback.Run(error);
 }
 
 void GDataFileSystem::OnRemovedDocument(
     const FileOperationCallback& callback,
     const FilePath& file_path,
     GDataErrorCode status,
     const GURL& document_url) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GDataFileError error = util::GDataToGDataFileError(status);
@@ skipping 189 matching lines @@
     OnDirectoryChanged(moved_file_path.DirName());
 
   if (!callback.is_null())
     callback.Run(error, moved_file_path);
 }
 
 void GDataFileSystem::OnMoveEntryToDirectoryWithFileOperationCallback(
     const FileOperationCallback& callback,
     GDataFileError error,
     const FilePath& moved_file_path) {
+  DCHECK(!callback.is_null());
+
   if (error == GDATA_FILE_OK)
     OnDirectoryChanged(moved_file_path.DirName());
 
-  if (!callback.is_null())
-    callback.Run(error);
+  callback.Run(error);
 }
 
 GDataFileError GDataFileSystem::RemoveEntryFromFileSystem(
     const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::string resource_id;
   GDataFileError error = RemoveEntryFromGData(file_path, &resource_id);
   if (error != GDATA_FILE_OK)
     return error;
@@ skipping 698 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata