drive: Stop returning ResourceEntry from JobScheduler

chrome/browser/chromeos/drive/job_scheduler.h

Index: chrome/browser/chromeos/drive/job_scheduler.h
diff --git a/chrome/browser/chromeos/drive/job_scheduler.h b/chrome/browser/chromeos/drive/job_scheduler.h
index e58ada59f699f7808bb28fd0ff931bd1e8205295..158f6439d6e1af04dd0c9f070a2abf5e67182f4e 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.h
+++ b/chrome/browser/chromeos/drive/job_scheduler.h
@@ -112,10 +112,10 @@ class JobScheduler
   void GetRemainingFileList(const GURL& next_link,
                             const google_apis::FileListCallback& callback);
 
-  // Adds a GetResourceEntry operation to the queue.
-  void GetResourceEntry(const std::string& resource_id,
-                        const ClientContext& context,
-                        const google_apis::GetResourceEntryCallback& callback);
+  // Adds a GetFileResource operation to the queue.
+  void GetFileResource(const std::string& resource_id,
+                       const ClientContext& context,
+                       const google_apis::FileResourceCallback& callback);
 
   // Adds a GetShareUrl operation to the queue.
   void GetShareUrl(const std::string& resource_id,
@@ -129,22 +129,20 @@ class JobScheduler
                      const google_apis::EntryActionCallback& callback);
 
   // Adds a CopyResource operation to the queue.
-  void CopyResource(
-      const std::string& resource_id,
-      const std::string& parent_resource_id,
-      const std::string& new_title,
-      const base::Time& last_modified,
-      const google_apis::GetResourceEntryCallback& callback);
+  void CopyResource(const std::string& resource_id,
+                    const std::string& parent_resource_id,
+                    const std::string& new_title,
+                    const base::Time& last_modified,
+                    const google_apis::FileResourceCallback& callback);
 
   // Adds a UpdateResource operation to the queue.
-  void UpdateResource(
-      const std::string& resource_id,
-      const std::string& parent_resource_id,
-      const std::string& new_title,
-      const base::Time& last_modified,
-      const base::Time& last_viewed_by_me,
-      const ClientContext& context,
-      const google_apis::GetResourceEntryCallback& callback);
+  void UpdateResource(const std::string& resource_id,
+                      const std::string& parent_resource_id,
+                      const std::string& new_title,
+                      const base::Time& last_modified,
+                      const base::Time& last_viewed_by_me,
+                      const ClientContext& context,
+                      const google_apis::FileResourceCallback& callback);
 
   // Adds a RenameResource operation to the queue.
   void RenameResource(const std::string& resource_id,
@@ -169,7 +167,7 @@ class JobScheduler
       const std::string& directory_title,
       const DriveServiceInterface::AddNewDirectoryOptions& options,
       const ClientContext& context,
-      const google_apis::GetResourceEntryCallback& callback);
+      const google_apis::FileResourceCallback& callback);
 
   // Adds a DownloadFile operation to the queue.
   // The first two arguments |virtual_path| and |expected_file_size| are used
@@ -192,7 +190,7 @@ class JobScheduler
                      const std::string& content_type,
                      const DriveUploader::UploadNewFileOptions& options,
                      const ClientContext& context,
-                     const google_apis::GetResourceEntryCallback& callback);
+                     const google_apis::FileResourceCallback& callback);
 
   // Adds an UploadExistingFile operation to the queue.
   void UploadExistingFile(
@@ -202,7 +200,7 @@ class JobScheduler
       const std::string& content_type,
       const DriveUploader::UploadExistingFileOptions& options,
       const ClientContext& context,
-      const google_apis::GetResourceEntryCallback& callback);
+      const google_apis::FileResourceCallback& callback);
 
   // Adds AddPermission operation to the queue. |callback| must not be null.
   void AddPermission(const std::string& resource_id,
@@ -289,7 +287,7 @@ class JobScheduler
   // Callback for job finishing with a FileResourceCallback.
   void OnGetFileResourceJobDone(
       JobID job_id,
-      const google_apis::GetResourceEntryCallback& callback,
+      const google_apis::FileResourceCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::FileResource> entry);
 
@@ -330,7 +328,7 @@ class JobScheduler
   void OnUploadCompletionJobDone(
       JobID job_id,
       const ResumeUploadParams& resume_params,
-      const google_apis::GetResourceEntryCallback& callback,
+      const google_apis::FileResourceCallback& callback,
       google_apis::GDataErrorCode error,
       const GURL& upload_location,
       scoped_ptr<google_apis::FileResource> entry);
@@ -339,7 +337,7 @@ class JobScheduler
   void OnResumeUploadFileDone(
       JobID job_id,
       const base::Callback<google_apis::CancelCallback()>& original_task,
-      const google_apis::GetResourceEntryCallback& callback,
+      const google_apis::FileResourceCallback& callback,
       google_apis::GDataErrorCode error,
       const GURL& upload_location,
       scoped_ptr<google_apis::FileResource> entry);