gdata: Remove GDataDirectoryService::FindEntryByPathAndRunSync().

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 539 matching lines @@
       GURL* last_dir_content_url,
       FilePath* first_missing_parent_path);
 
   // Callback for handling results of ReloadFeedFromServerIfNeeded() initiated
   // from CheckForUpdates(). This callback checks whether feed is successfully
   // reloaded, and in case of failure, restores the content origin of the root
   // directory.
   void OnUpdateChecked(ContentOrigin initial_origin,
                        GDataFileError error);
 
-  // Finds the entry for |search_file_path| synchronously and runs the
-  // callback, then notifies that the initial load is finished.
+  // Notifies that the initial load is finished and runs |callback|.
   // |callback| must not be null.
-  void FindAndNotifyInitialLoadFinished(const FilePath& search_file_path,
-                                        const FindEntryCallback& callback,
-                                        GDataFileError error);
+  void NotifyInitialLoadFinishedAndRun(const FileOperationCallback& callback,
+                                       GDataFileError error);
 
   // Helper function that completes bookkeeping tasks related to
   // completed file transfer.
   void OnTransferCompleted(const FileOperationCallback& callback,
                            GDataFileError error,
                            scoped_ptr<UploadFileInfo> upload_file_info);
 
   // Kicks off file upload once it receives |file_size| and |content_type|.
   void StartFileUploadOnUIThread(const StartFileUploadParams& params,
                                  GDataFileError* error,
@@ skipping 32 matching lines @@
                           GDataErrorCode status,
                           scoped_ptr<base::Value> data);
 
   // Starts downloading a file if we have enough disk space indicated by
   // |has_enough_space|.
   void StartDownloadFileIfEnoughSpace(const GetFileFromCacheParams& params,
                                       const GURL& content_url,
                                       const FilePath& cache_file_path,
                                       bool* has_enough_space);
 
-  // Helper function used to perform synchronous file search on UI thread.
-  // |callback| must not be null.
-  void FindEntryByPathSyncOnUIThread(const FilePath& search_file_path,
-                                     const FindEntryCallback& callback);
-
   // Changes state of hosted documents visibility, triggers directory refresh.
   void SetHideHostedDocuments(bool hide);
 
   // Initializes preference change observer.
   void InitializePreferenceObserver();
 
-  // Called when an entry is found for GetEntryInfoByPath().
+  // Part of GetEntryInfoByPathOnUIThread()
+  // 1) Called when the feed is loaded.
+  // 2) Called when an entry is found.
   // |callback| must not be null.
-  void OnGetEntryInfo(const GetEntryInfoCallback& callback,
-                      GDataFileError error,
-                      GDataEntry* entry);
+  void GetEntryInfoByPathOnUIThreadAfterLoad(
+      const FilePath& file_path,
+      const GetEntryInfoCallback& callback,
+      GDataFileError error);
+  void GetEntryInfoByPathOnUIThreadAfterGetEntry(
+      const GetEntryInfoCallback& callback,
+      GDataFileError error,
+      scoped_ptr<GDataEntryProto> entry_proto);
 
-  // Called when an entry is found for ReadDirectoryByPath().
+  // Part of ReadDirectoryByPathOnUIThread()
+  // 1) Called when the feed is loaded.
+  // 2) Called when an entry is found.
   // |callback| must not be null.
-  void OnReadDirectory(const ReadDirectoryWithSettingCallback& callback,
-                       GDataFileError error,
-                       GDataEntry* entry);
+  void ReadDirectoryByPathOnUIThreadAfterLoad(
+      const FilePath& file_path,
+      const ReadDirectoryWithSettingCallback& callback,
+      GDataFileError error);
+  void ReadDirectoryByPathOnUIThreadAfterRead(
+      const ReadDirectoryWithSettingCallback& callback,
+      GDataFileError error,
+      scoped_ptr<GDataEntryProtoVector> entries);
 
-  // Finds file info by using virtual |file_path|. This call will also
-  // retrieve and refresh file system content from server and disk cache.
+  // Loads the feed from the cache or the server if not yet loaded. Runs
+  // |callback| upon the completion with the error code.
   // |callback| must not be null.
-  void FindEntryByPathAsyncOnUIThread(const FilePath& search_file_path,
-                                      const FindEntryCallback& callback);
+  void LoadFeedIfNeeded(const FileOperationCallback& callback);
 
   // Gets |file_path| from the file system after the file info is already
   // resolved with GetEntryInfoByPath(). This function is called by
   // OnGetEntryInfoCompleteForGetFileByPath and
   // OnGetEntryInfoCompleteForOpenFile.
   void GetResolvedFileByPath(
       const FilePath& file_path,
       const GetFileCallback& get_file_callback,
       const GetContentCallback& get_content_callback,
       GDataFileError error,
@@ skipping 66 matching lines @@
       const GetFileCallback& get_file_callback,
       const GetContentCallback& get_content_callback,
       GDataEntry* entry);
   void GetEntryInfoByEntryOnUIThread(
       const GetEntryInfoWithFilePathCallback& callback,
       GDataEntry* entry);
   void UpdateFileByResourceIdOnUIThread(const std::string& resource_id,
                                         const FileOperationCallback& callback);
   void UpdateFileByEntryOnUIThread(const FileOperationCallback& callback,
                                    GDataEntry* entry);
-  void GetEntryInfoByPathAsyncOnUIThread(const FilePath& file_path,
-                                         const GetEntryInfoCallback& callback);
+  void GetEntryInfoByPathOnUIThread(const FilePath& file_path,
+                                    const GetEntryInfoCallback& callback);
   void GetEntryInfoByResourceIdOnUIThread(
       const std::string& resource_id,
       const GetEntryInfoWithFilePathCallback& callback);
-  void ReadDirectoryByPathAsyncOnUIThread(
+  void ReadDirectoryByPathOnUIThread(
       const FilePath& file_path,
       const ReadDirectoryWithSettingCallback& callback);
   void RequestDirectoryRefreshOnUIThread(const FilePath& file_path);
   void OnRequestDirectoryRefresh(const FilePath& directory_path,
                                  GetDocumentsParams* params,
                                  GDataFileError error);
   void GetAvailableSpaceOnUIThread(const GetAvailableSpaceCallback& callback);
   void AddUploadedFileOnUIThread(UploadMode upload_mode,
                                  const FilePath& virtual_dir_path,
                                  scoped_ptr<DocumentEntry> entry,
@@ skipping 97 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_