drive: Stop returning ResourceEntry from JobScheduler

chrome/browser/chromeos/drive/job_scheduler.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_JOB_SCHEDULER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_
 
 #include <vector>
 
 #include "base/id_map.h"
@@ skipping 94 matching lines @@
   // Adds GetRemainingChangeList operation to the queue.
   // |callback| must not be null.
   void GetRemainingChangeList(const GURL& next_link,
                               const google_apis::ChangeListCallback& callback);
 
   // Adds GetRemainingFileList operation to the queue.
   // |callback| must not be null.
   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,
                    const GURL& embed_origin,
                    const ClientContext& context,
                    const google_apis::GetShareUrlCallback& callback);
 
   // Adds a TrashResource operation to the queue.
   void TrashResource(const std::string& resource_id,
                      const ClientContext& context,
                      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,
                       const std::string& new_title,
                       const google_apis::EntryActionCallback& callback);
 
   // Adds a AddResourceToDirectory operation to the queue.
   void AddResourceToDirectory(const std::string& parent_resource_id,
                               const std::string& resource_id,
                               const google_apis::EntryActionCallback& callback);
 
   // Adds a RemoveResourceFromDirectory operation to the queue.
   void RemoveResourceFromDirectory(
       const std::string& parent_resource_id,
       const std::string& resource_id,
       const ClientContext& context,
       const google_apis::EntryActionCallback& callback);
 
   // Adds a AddNewDirectory operation to the queue.
   void AddNewDirectory(
       const std::string& parent_resource_id,
       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
   // only for filling JobInfo for the operation so that observers can get the
   // detail. The actual operation never refers these values.
   JobID DownloadFile(
       const base::FilePath& virtual_path,
       int64 expected_file_size,
       const base::FilePath& local_cache_path,
       const std::string& resource_id,
       const ClientContext& context,
       const google_apis::DownloadActionCallback& download_action_callback,
       const google_apis::GetContentCallback& get_content_callback);
 
   // Adds an UploadNewFile operation to the queue.
   void UploadNewFile(const std::string& parent_resource_id,
                      const base::FilePath& drive_file_path,
                      const base::FilePath& local_file_path,
                      const std::string& title,
                      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(
       const std::string& resource_id,
       const base::FilePath& drive_file_path,
       const base::FilePath& local_file_path,
       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,
                      const std::string& email,
                      google_apis::drive::PermissionRole role,
                      const google_apis::EntryActionCallback& callback);
 
  private:
   friend class JobSchedulerTest;
 
@@ skipping 66 matching lines @@
   // Callback for job finishing with a ChangeListCallback.
   void OnGetChangeListJobDone(
       JobID job_id,
       const google_apis::ChangeListCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ChangeList> change_list);
 
   // 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);
 
   // Callback for job finishing with a AboutResourceCallback.
   void OnGetAboutResourceJobDone(
       JobID job_id,
       const google_apis::AboutResourceCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
@@ skipping 20 matching lines @@
   void OnDownloadActionJobDone(
       JobID job_id,
       const google_apis::DownloadActionCallback& callback,
       google_apis::GDataErrorCode error,
       const base::FilePath& temp_file);
 
   // Callback for job finishing with a UploadCompletionCallback.
   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);
 
   // Callback for DriveUploader::ResumeUploadFile().
   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);
 
   // Updates the progress status of the specified job.
   void UpdateProgress(JobID job_id, int64 progress, int64 total);
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver override.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
@@ skipping 48 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<JobScheduler> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(JobScheduler);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_JOB_SCHEDULER_H_