drive: Stop returning FilePath from GetResourceEntryById

chrome/browser/chromeos/drive/file_system.h

Index: chrome/browser/chromeos/drive/file_system.h
diff --git a/chrome/browser/chromeos/drive/file_system.h b/chrome/browser/chromeos/drive/file_system.h
index ca4d3fac0ae7412ec1b80605d9027defdaf0aaaa..23f2305d2c4e244c5e19955eba1f340f512dfb8c 100644
--- a/chrome/browser/chromeos/drive/file_system.h
+++ b/chrome/browser/chromeos/drive/file_system.h
@@ -64,7 +64,7 @@ class FileSystem : public FileSystemInterface,
   virtual void CheckForUpdates() OVERRIDE;
   virtual void GetResourceEntryById(
       const std::string& resource_id,
-      const GetResourceEntryWithFilePathCallback& callback) OVERRIDE;
+      const GetResourceEntryCallback& callback) OVERRIDE;
   virtual void Search(const std::string& search_query,
                       const GURL& next_feed,
                       const SearchCallback& callback) OVERRIDE;
@@ -295,22 +295,19 @@ class FileSystem : public FileSystemInterface,
   // ResourceMetadata::GetResourceEntryById() is complete.
   // |callback| must not be null.
   void GetResourceEntryByIdAfterGetEntry(
-      const GetResourceEntryWithFilePathCallback& callback,
+      const GetResourceEntryCallback& callback,
       FileError error,
-      const base::FilePath& file_path,
       scoped_ptr<ResourceEntry> entry);
 
   // Part of GetFileByResourceId(). Called after
-  // ResourceMetadata::GetResourceEntryById() is complete.
+  // ResourceMetadata::GetFilePath() is complete.
   // |get_file_callback| must not be null.
   // |get_content_callback| may be null.
-  void GetFileByResourceIdAfterGetEntry(
+  void GetFileByResourceIdAfterGetFilePath(
       const DriveClientContext& context,
       const GetFileCallback& get_file_callback,
       const google_apis::GetContentCallback& get_content_callback,
-      FileError error,
-      const base::FilePath& file_path,
-      scoped_ptr<ResourceEntry> entry);
+      const base::FilePath& file_path);
 
   // Part of RefreshDirectory(). Called after
   // GetResourceEntryByPath() is complete.