gdata: Fix bad function names in GDataFileSystem

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 372 matching lines @@
                                   const FileOperationCallback& callback,
                                   GDataFileError error,
                                   const FilePath& file_path);
 
   // Part of MoveEntryFromRootDirectory(). Called after
   // GetEntryInfoPairByPaths() is complete. |callback| must not be null.
   void MoveEntryFromRootDirectoryAfterGetEntryInfoPair(
     const FileOperationCallback& callback,
     scoped_ptr<EntryInfoPairResult> result);
 
-  // Removes a file or directory at |file_path| from the directory at
-  // |dir_path| and moves it to the root directory.
+  // Removes a file or directory at |file_path| from the current directory if
+  // it's not in the root directory. This essentially moves an entry to the
+  // root directory on the server side.
   //
   // Can be called from UI thread. |callback| is run on the calling thread.
-  void RemoveEntryFromDirectory(const FilePath& dir_path,
-                                const FileMoveCallback& callback,
-                                GDataFileError error,
-                                const FilePath& file_path);
+  // |callback| must not be null.
+  void RemoveEntryFromNonRootDirectory(const FileMoveCallback& callback,
+                                       GDataFileError error,
+                                       const FilePath& file_path);
 
-  // Removes file under |file_path| from in-memory snapshot of the file system.
+  // Removes file under |file_path| on the client side.
   // |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);
+  GDataFileError RemoveEntryOnClientSide(const FilePath& file_path,
+                                         std::string* resource_id);
 
   // A pass-through callback used for bridging from
   // 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.
@@ skipping 73 matching lines @@
       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);
 
   // 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,
+  // directory at |file_path| on the client side.
+  // |callback| must not be null.
+  void RenameFileOnClientSide(const FilePath& file_path,

[achuithb, 2012/08/10 08:59:13]

Not sure I like OnClientSide. How about Locally? So RenameFileLocally? Same for
others.

[satorux1, 2012/08/10 15:56:03]

Locally sounds good. Fixed everywhere. Kept "on the client side" in function
comments as it sounded slightly more descriptive than locally.

Besides, RenameFileOnClientSide() had to be RenameEntryLocally() as we are
dealing with a file or a directory. Changed.

                               const FilePath::StringType& new_name,
                               const FileMoveCallback& callback,
                               GDataErrorCode status,
                               const GURL& document_url);
 
   // 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(
+  // another directory. Moves a file or directory at |file_path| to root on
+  // the client side.
+  // |callback| must not be null.
+  void MoveEntryToRootDirectoryOnClientSide(
       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);
+  // Removes a file or directory under |file_path| on the client side and the
+  // corresponding file from cache if it exists.  Returns PLATFORM_FILE_OK if
+  // successful.
+  GDataFileError RemoveEntryOnClientSide(const FilePath& file_path);

[achuithb, 2012/08/10 08:59:13]

Method overloading is forbidden. You need a different name.

[satorux1, 2012/08/10 15:56:03]

Good catch!! Didn't expect a name collision after renaming. Fixed.

 
-  // Callback for GDataDirectoryService::MoveEntryToDirectory with
-  // FileMoveCallback.
-  void OnMoveEntryToDirectoryWithFileMoveCallback(
+  // Callback when an entry is moved to another directory on the client side.
+  // Notifies the directory change and runs |callback|.
+  // |callback| must not be null.
+  void NotifyAndRunFileMoveCallback(
       const FileMoveCallback& callback,
       GDataFileError error,
       const FilePath& moved_file_path);
 
-  // Callback for GDataDirectoryService::MoveEntryToDirectory with
-  // FileOperationCallback.
+  // Callback when an entry is moved to another directory on the client side.
+  // Notifies the directory change and runs |callback|.
   // |callback| must not be null.
-  void OnMoveEntryToDirectoryWithFileOperationCallback(
+  void NotifyAndRunFileOperationCallback(
       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);
 
@@ skipping 311 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_