Replace GDataDirectory::TakeEntry with GDataDirectoryService::AddEntryToDirectory.

chrome/browser/chromeos/gdata/gdata_file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 153 matching lines @@
   struct CreateDirectoryParams;
 
   // Defines set of parameters passed to an intermediate callback
   // OnGetFileCompleteForOpen, during execution of OpenFile() method.
   struct GetFileCompleteForOpenParams;
 
   // Defines set of parameters passed to intermediate callbacks during
   // execution of GetFileByPath() method.
   struct GetFileFromCacheParams;
 
-  // Callback similar to FileOperationCallback but with a given |file_path|.
-  typedef base::Callback<void(GDataFileError error,
-                              const FilePath& file_path)>
-      FilePathUpdateCallback;
 
   // Struct used for StartFileUploadOnUIThread().
   struct StartFileUploadParams;
 
   // Callback passed to |LoadFeedFromServer| from |Search| method.
   // |callback| is that should be run with data received from
   // |LoadFeedFromServer|.
   // |params| params used for getting document feed for content search.
   // |error| error code returned by |LoadFeedFromServer|.
   void OnSearch(const SearchCallback& callback,
@@ skipping 160 matching lines @@
 
   // Copies a document with |resource_id| to the directory at |dir_path|
   // and names the copied document as |new_name|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void CopyDocumentToDirectory(const FilePath& dir_path,
                                const std::string& resource_id,
                                const FilePath::StringType& new_name,
                                const FileOperationCallback& callback);
 
-  // Renames a file or directory at |file_path| to |new_name|.
+  // Renames a file or directory at |file_path| to |new_name| in the same
+  // directory. |callback| will receive the new file path if the operation is
+  // successful. If the new name already exists in the same directory, the file
+  // name is uniquified by adding a parenthesized serial number like
+  // "foo (2).txt"
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void Rename(const FilePath& file_path,
               const FilePath::StringType& new_name,
-              const FilePathUpdateCallback& callback);
+              const FileMoveCallback& callback);
 
   // Part of Rename(). Called after GetEntryInfoByPath() is complete.
   void RenameAfterGetEntryInfo(const FilePath& file_path,
                                const FilePath::StringType& new_name,
-                               const FilePathUpdateCallback& callback,
+                               const FileMoveCallback& callback,
                                GDataFileError error,
                                scoped_ptr<GDataEntryProto> entry_proto);
 
   // Adds a file or directory at |file_path| to the directory at |dir_path|.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void AddEntryToDirectory(const FilePath& dir_path,
                            const FileOperationCallback& callback,
                            GDataFileError error,
                            const FilePath& file_path);
 
   // Removes a file or directory at |file_path| from the directory at
   // |dir_path| and moves it to the root directory.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
   void RemoveEntryFromDirectory(const FilePath& dir_path,
-                                const FilePathUpdateCallback& callback,
+                                const FileMoveCallback& callback,
                                 GDataFileError error,
                                 const FilePath& file_path);
 
   // Removes file under |file_path| from in-memory snapshot of the file system.
   // |resource_id| contains the resource id of the removed file if it was a
   // file.
   // Return PLATFORM_FILE_OK if successful.
   GDataFileError RemoveEntryFromGData(const FilePath& file_path,
                                                std::string* resource_id);
 
   // A pass-through callback used for bridging from
-  // FilePathUpdateCallback to FileOperationCallback.
+  // FileMoveCallback to FileOperationCallback.
   void OnFilePathUpdated(const FileOperationCallback& cllback,
                          GDataFileError error,
                          const FilePath& file_path);
 
   // Invoked upon completion of MarkDirtyInCache initiated by OpenFile. Invokes
   // |callback| with |cache_file_path|, which is the path of the cache file
   // ready for modification.
   //
   // Must be called on UI thread.
   void OnMarkDirtyInCacheCompleteForOpenFile(
       const OpenFileCallback& callback,
       GDataFileError error,
       const std::string& resource_id,
       const std::string& md5,
       const FilePath& cache_file_path);
 
-  // Callback for handling resource rename attempt.
-  void OnRenameResourceCompleted(const FilePath& file_path,
-                                 const FilePath::StringType& new_name,
-                                 const FilePathUpdateCallback& callback,
-                                 GDataErrorCode status,
-                                 const GURL& document_url);
-
   // Callback for handling document copy attempt.
   void OnCopyDocumentCompleted(const FilePath& dir_path,
                                const FileOperationCallback& callback,
                                GDataErrorCode status,
                                scoped_ptr<base::Value> data);
 
   // Callback for handling an attempt to add a file or directory to another
   // directory.
   void OnAddEntryToDirectoryCompleted(const FileOperationCallback& callback,
                                       const FilePath& file_path,
                                       const FilePath& dir_path,
                                       GDataErrorCode status,
                                       const GURL& document_url);
 
-  // Callback for handling an attempt to remove a file or directory from
-  // another directory.
-  void OnRemoveEntryFromDirectoryCompleted(
-      const FilePathUpdateCallback& callback,
-      const FilePath& file_path,
-      const FilePath& dir_path,
-      GDataErrorCode status,
-      const GURL& document_url);
-
   // Callback for handling account metadata fetch.
   void OnGetAvailableSpace(
       const GetAvailableSpaceCallback& callback,
       GDataErrorCode status,
       scoped_ptr<base::Value> data);
 
   // Callback for handling document remove attempt.
   void OnRemovedDocument(
       const FileOperationCallback& callback,
       const FilePath& file_path,
@@ skipping 27 matching lines @@
       const GURL& content_url,
       const FilePath& downloaded_file_path,
       bool* has_enough_space);
 
   // Callback for handling internal StoreToCache() calls after downloading
   // file content.
   void OnDownloadStoredToCache(GDataFileError error,
                                const std::string& resource_id,
                                const std::string& md5);
 
-  // Renames a file or directory at |file_path| on in-memory snapshot
-  // of the file system. Returns PLATFORM_FILE_OK if successful.
-  GDataFileError RenameFileOnFilesystem(
-      const FilePath& file_path, const FilePath::StringType& new_name,
-      FilePath* updated_file_path);
+  // Callback for handling resource rename attempt. Renames a file or
+  // directory at |file_path| on in-memory snapshot of the file system.
+  void RenameFileOnFileSystem(const FilePath& file_path,
+                              const FilePath::StringType& new_name,
+                              const FileMoveCallback& callback,
+                              GDataErrorCode status,
+                              const GURL& document_url);
 
-  // Adds an |entry| to another directory at |dir_path| on in-memory snapshot
-  // of the file system. Returns PLATFORM_FILE_OK if successful.
-  GDataFileError AddEntryToDirectoryOnFilesystem(
-      GDataEntry* entry, const FilePath& dir_path);
-
-  // Removes a file or directory at |file_path| from another directory at
-  // |dir_path| on in-memory snapshot of the file system.
-  // Returns PLATFORM_FILE_OK if successful.
-  GDataFileError RemoveEntryFromDirectoryOnFilesystem(
-      const FilePath& file_path, const FilePath& dir_path,
-      FilePath* updated_file_path);
+  // Callback for handling an attempt to remove a file or directory from
+  // another directory. Removes a file or directory at |file_path| and moves it
+  // to root on in-memory snapshot of the file system.
+  void RemoveEntryFromDirectoryOnFileSystem(
+      const FileMoveCallback& callback,
+      const FilePath& file_path,
+      const FilePath& dir_path,
+      GDataErrorCode status,
+      const GURL& document_url);
 
   // Removes a file or directory under |file_path| from in-memory snapshot of
   // the file system and the corresponding file from cache if it exists.
   // Return PLATFORM_FILE_OK if successful.
   GDataFileError RemoveEntryFromFileSystem(const FilePath& file_path);
 
+  // Callback for GDataDirectoryService::MoveEntryToDirectory with
+  // FileMoveCallback.
+  void OnMoveEntryToDirectoryWithFileMoveCallback(
+      const FileMoveCallback& callback,
+      GDataFileError error,
+      const FilePath& moved_file_path);
+
+  // Callback for GDataDirectoryService::MoveEntryToDirectory with
+  // FileOperationCallback.
+  void OnMoveEntryToDirectoryWithFileOperationCallback(
+      const FileOperationCallback& callback,
+      GDataFileError error,
+      const FilePath& moved_file_path);
+
   // Callback for GetEntryByResourceIdAsync.
   // Removes stale entry upon upload of file.
   static void RemoveStaleEntryOnUpload(const std::string& resource_id,
                                        GDataDirectory* parent_dir,
                                        GDataEntry* existing_entry);
 
   // Converts |entry_value| into GFileDocument instance and adds it
   // to virtual file system at |directory_path|.
   GDataFileError AddNewDirectory(const FilePath& directory_path,
                                           base::Value* entry_value);
@@ skipping 293 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GDataFileSystem> ui_weak_ptr_factory_;
   // Unlike other classes, we need this as we need this to redirect a task
   // from IO thread to UI thread.
   base::WeakPtr<GDataFileSystem> ui_weak_ptr_;
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_FILE_SYSTEM_H_