drive: Stop returning FilePath from GetResourceEntryById

chrome/browser/chromeos/drive/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_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 46 matching lines @@
              base::SequencedTaskRunner* blocking_task_runner);
   virtual ~FileSystem();
 
   // 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 Search(const std::string& search_query,
                       const GURL& next_feed,
                       const SearchCallback& callback) OVERRIDE;
   virtual void SearchMetadata(const std::string& query,
                               int options,
                               int at_most_num_matches,
                               const SearchMetadataCallback& callback) OVERRIDE;
   virtual void TransferFileFromRemoteToLocal(
       const base::FilePath& remote_src_file_path,
       const base::FilePath& local_dest_file_path,
@@ skipping 210 matching lines @@
       FileError error);
   void ReadDirectoryByPathAfterRead(
       const ReadDirectoryWithSettingCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntryVector> entries);
 
   // Part of GetResourceEntryById(). Called after
   // 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 RefreshDirectory(). Called after
   // GetResourceEntryByPath() is complete.
   void RefreshDirectoryAfterGetResourceEntry(
       const base::FilePath& directory_path,
       const FileOperationCallback& callback,
       FileError error,
       scoped_ptr<ResourceEntry> entry);
 
@@ skipping 64 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<FileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_