drive: Stop returning FilePath from GetResourceEntryById

chrome/browser/chromeos/drive/fake_file_system.h

 // Copyright (c) 2013 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_DRIVE_FAKE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FAKE_FILE_SYSTEM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 35 matching lines @@
   // for testing purpose. Returns true for success.
   bool InitializeForTesting();
 
   // FileSystemInterface Overrides.
   virtual void Initialize() OVERRIDE;
   virtual void AddObserver(FileSystemObserver* observer) OVERRIDE;
   virtual void RemoveObserver(FileSystemObserver* observer) OVERRIDE;
   virtual void CheckForUpdates() OVERRIDE;
   virtual void GetResourceEntryById(
       const std::string& resource_id,
-      const GetResourceEntryWithFilePathCallback& callback) OVERRIDE;
+      const GetResourceEntryCallback& callback) OVERRIDE;
   virtual void TransferFileFromRemoteToLocal(
       const base::FilePath& remote_src_file_path,
       const base::FilePath& local_dest_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void TransferFileFromLocalToRemote(
       const base::FilePath& local_src_file_path,
       const base::FilePath& remote_dest_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void OpenFile(const base::FilePath& file_path,
                         const OpenFileCallback& callback) OVERRIDE;
@@ skipping 65 matching lines @@
   virtual void MarkCacheFileAsUnmounted(
       const base::FilePath& cache_file_path,
       const FileOperationCallback& callback) OVERRIDE;
   virtual void GetCacheEntryByResourceId(
       const std::string& resource_id,
       const std::string& md5,
       const GetCacheEntryCallback& callback) OVERRIDE;
   virtual void Reload() OVERRIDE;
 
  private:
-  // Callback to return the result of GetFilePath.
-  typedef base::Callback<void(const base::FilePath& file_path)>
-      GetFilePathCallback;
-
-  // Returns the path for the |resource_id| via |callback|.
-  // How the method works:
-  // 1) Gets AboutResource from the drive service to obtain root resource id.
-  // 2) Gets ResourceEntry from the drive service to get the base name,
-  //    prepends it to the |file_path|. Unless it is root, also tries for
-  //    the parent recursively.
-  void GetFilePath(const std::string& resource_id,
-                   const GetFilePathCallback& callback);
-  void GetFilePathAfterGetAboutResource(
-      const std::string& resource_id,
-      const GetFilePathCallback& callback,
-      google_apis::GDataErrorCode error,
-      scoped_ptr<google_apis::AboutResource> about_resource);
-  void GetFilePathInternal(
-      const std::string& root_resource_id,
-      const std::string& resource_id,
-      const base::FilePath& file_path,
-      const GetFilePathCallback& callback);
-  void GetFilePathAfterGetResourceEntry(
-      const std::string& root_resource_id,
-      const base::FilePath& remaining_file_path,
-      const GetFilePathCallback& callback,
+  // Helper of GetResourceEntryById.
+  void GetResourceEntryByIdAfterGetResourceEntry(
+      const GetResourceEntryCallback& callback,
       google_apis::GDataErrorCode error_in,
       scoped_ptr<google_apis::ResourceEntry> resource_entry);
 
-  // Helpers of GetResourceEntryById.
-  // How the method works:
-  // 1) Gets ResourceEntry from the drive service.
-  // 2) Gets the file path of the resource.
-  // 3) Runs the |callback|.
-  void GetResourceEntryByIdAfterGetResourceEntry(
-      const GetResourceEntryWithFilePathCallback& callback,
-      google_apis::GDataErrorCode error_in,
-      scoped_ptr<google_apis::ResourceEntry> resource_entry);
-  void GetResourceEntryByIdAfterGetFilePath(
-      const GetResourceEntryWithFilePathCallback& callback,
-      FileError error,
-      scoped_ptr<ResourceEntry> entry,
-      const base::FilePath& parent_file_path);
-
   // Helpers of GetFileContentByPath.
   // How the method works:
   // 1) Gets ResourceEntry of the path.
   // 2) Look at if there is a cache file or not. If found return it.
   // 3) Otherwise start DownloadFile.
   // 4) Runs the |completion_callback| upon the download completion.
   void GetFileContentByPathAfterGetResourceEntry(
       const base::FilePath& file_path,
       const GetFileContentInitializedCallback& initialized_callback,
       const google_apis::GetContentCallback& get_content_callback,
@@ skipping 45 matching lines @@
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FakeFileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeFileSystem);
 };
 
 }  // namespace test_util
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FAKE_FILE_SYSTEM_H_