GDataFileSystem is no longer a friend of GDataDirectory.

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;
 
-
   // Struct used for StartFileUploadOnUIThread().
   struct StartFileUploadParams;
 
+  // Struct used for AddUploadedFile.
+  struct AddUploadedFileParams;
+
   // 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,
                 GetDocumentsParams* params,
                 GDataFileError error);
 
   // Part of TransferFileFromLocalToRemote(). Called after
@@ skipping 306 matching lines @@
                                        GDataErrorCode status,
                                        const GURL& document_url);
 
   // 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 RemoveEntryAndCacheLocally(const FilePath& file_path);
 
   // 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.
+  // |callback| may be null.
   void NotifyAndRunFileMoveCallback(
       const FileMoveCallback& callback,
       GDataFileError error,
       const FilePath& moved_file_path);
 
   // 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 NotifyAndRunFileOperationCallback(
       const FileOperationCallback& callback,
       GDataFileError error,
       const FilePath& moved_file_path);
 
+  // FileMoveCallback for directory changes.
+  void OnDirectoryChangeFileMoveCallback(
+      GDataFileError error,
+      const FilePath& directory_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);
+  void RemoveStaleEntryOnUpload(const std::string& resource_id,
+                                GDataDirectory* parent_dir,
+                                const FileMoveCallback& callback,
+                                GDataEntry* existing_entry);
+
+  // Continues to add an uploaded file after existing entry has been deleted.
+  void ContinueAddUploadedFile(AddUploadedFileParams* params,
+                               GDataFileError error,
+                               const FilePath& file_path);
+
+  // Adds the uploaded file to the cache.
+  void AddUploadedFileToCache(AddUploadedFileParams* params,
+                              GDataFileError error,
+                              const FilePath& file_path);
 
   // 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);
 
   // Given non-existing |directory_path|, finds the first missing parent
   // directory of |directory_path|.
   FindMissingDirectoryResult FindFirstMissingParentDirectory(
       const FilePath& directory_path,
@@ skipping 183 matching lines @@
                                          const GetEntryInfoCallback& callback);
   void GetEntryInfoByResourceIdOnUIThread(
       const std::string& resource_id,
       const GetEntryInfoWithFilePathCallback& callback);
   void ReadDirectoryByPathAsyncOnUIThread(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback);
   void RequestDirectoryRefreshOnUIThread(const FilePath& file_path);
   void OnRequestDirectoryRefresh(GetDocumentsParams* params,
                                  GDataFileError error);
-  void RequestDirectoryRefreshByEntry(const FilePath& directory_path,
-                                      const std::string& directory_resource_id,
-                                      const FileResourceIdMap& file_map,
-                                      GDataEntry* directory_entry);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void AddUploadedFileOnUIThread(UploadMode upload_mode,
                                  const FilePath& virtual_dir_path,
                                  scoped_ptr<DocumentEntry> entry,
                                  const FilePath& file_content_path,
                                  GDataCache::FileOperationType cache_operation,
                                  const base::Closure& callback);
 
   // Part of CopyOnUIThread(). Called after GetEntryInfoPairByPaths() is
   // complete. |callback| must not be null.
@@ skipping 91 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_