drive: Rename JobScheduler::QueueEntry to JobEntry

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 <list>
 #include <vector>
 
@@ skipping 145 matching lines @@
   friend class JobSchedulerTest;
 
   enum QueueType {
     METADATA_QUEUE,
     FILE_QUEUE,
     NUM_QUEUES
   };
 
   static const int kMaxJobCount[NUM_QUEUES];
 
-  // Represents a single entry in the job queue.
-  struct QueueEntry {
-    QueueEntry();
-    ~QueueEntry();
+  // Represents a single entry in the job map.
+  struct JobEntry {
+    explicit JobEntry(JobType type);
+    ~JobEntry();
 
-    // Compare the two entries, per job priorities. Used for sorting entries
-    // from high priority to low priority.
-    static bool Compare(const QueueEntry* left, const QueueEntry* right);
+    // Returns true when |left| is in higher priority than |right|.
+    // Used for sorting entries from high priority to low priority.
+    static bool Less(const JobEntry& left, const JobEntry& right);
 
-    JobID job_id;
+    JobInfo job_info;
 
     // Context of the job.
     DriveClientContext context;
 
     // Resource ID to use for the operation.
     // Used by:
     //   TYPE_GET_RESOURCE_ENTRY
     //   TYPE_DELETE_RESOURCE
     //   TYPE_RENAME_RESOURCE
     //   TYPE_ADD_RESOURCE_TO_DIRECTORY
@@ skipping 101 matching lines @@
     //   TYPE_UPLOAD_NEW_FILE
     //   TYPE_UPLOAD_EXISTING_FILE
     std::string content_type;
     std::string etag;
     std::string title;
     google_apis::UploadCompletionCallback upload_completion_callback;
   };
 
   // Adds the specified job to the queue and starts the job loop for the queue
   // if needed. Returns the job ID for the new job.
-  JobID StartNewJob(scoped_ptr<QueueEntry> job, JobType type);
+  JobID StartNewJob(scoped_ptr<JobEntry> job);
 
-  // Adds the specified job to the queue.  Takes ownership of |job|
-  void QueueJob(scoped_ptr<QueueEntry> job);
+  // Adds the specified job to the queue.
+  void QueueJob(JobID job_id);
 
   // Starts the job loop, if it is not already running.
   void StartJobLoop(QueueType queue_type);
 
   // Determines the next job that should run, and starts it.
   void DoJobLoop(QueueType queue_type);
 
   // Checks if operations should be suspended, such as if the network is
   // disconnected.
   //
   // Returns true when it should stop, and false if it should continue.
   bool ShouldStopJobLoop(QueueType queue_type,
                          const  DriveClientContext& context);
 
   // Increases the throttle delay if it's below the maximum value, and posts a
   // task to continue the loop after the delay.
   void ThrottleAndContinueJobLoop(QueueType queue_type);
 
   // Resets the throttle delay to the initial value, and continues the job loop.
   void ResetThrottleAndContinueJobLoop(QueueType queue_type);
 
-  // Retries the |queue_entry| job if needed and returns false.
-  // Otherwise returns true.
-  bool OnJobDone(scoped_ptr<QueueEntry> queue_entry, FileError error);
+  // Retries the job if needed and returns false. Otherwise returns true.
+  bool OnJobDone(JobID job_id, FileError error);
 
   // Callback for job finishing with a GetResourceListCallback.
   void OnGetResourceListJobDone(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::GetResourceListCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceList> resource_list);
 
   // Callback for job finishing with a GetResourceEntryCallback.
   void OnGetResourceEntryJobDone(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::GetResourceEntryCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceEntry> entry);
 
   // Callback for job finishing with a GetAboutResourceCallback.
   void OnGetAboutResourceJobDone(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::GetAboutResourceCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   // Callback for job finishing with a GetAccountMetadataCallback.
   void OnGetAccountMetadataJobDone(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::GetAccountMetadataCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AccountMetadata> account_metadata);
 
   // Callback for job finishing with a GetAppListCallback.
   void OnGetAppListJobDone(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::GetAppListCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AppList> app_list);
 
   // Callback for job finishing with a EntryActionCallback.
-  void OnEntryActionJobDone(scoped_ptr<QueueEntry> queue_entry,
+  void OnEntryActionJobDone(JobID job_id,
+                            const google_apis::EntryActionCallback& callback,
                             google_apis::GDataErrorCode error);
 
   // Callback for job finishing with a DownloadActionCallback.
-  void OnDownloadActionJobDone(scoped_ptr<QueueEntry> queue_entry,
-                               google_apis::GDataErrorCode error,
-                               const base::FilePath& temp_file);
+  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(
-      scoped_ptr<QueueEntry> queue_entry,
+      JobID job_id,
+      const google_apis::UploadCompletionCallback& callback,
       google_apis::GDataErrorCode error,
       const base::FilePath& drive_path,
       const base::FilePath& file_path,
       scoped_ptr<google_apis::ResourceEntry> resource_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(
@@ skipping 21 matching lines @@
 
   // The number of times operations have failed in a row, capped at
   // kMaxThrottleCount.  This is used to calculate the delay before running the
   // next task.
   int throttle_count_;
 
   // Disables throttling for testing.
   bool disable_throttling_;
 
   // The queues of jobs.
-  std::list<QueueEntry*> queue_[NUM_QUEUES];
+  std::list<JobID> queue_[NUM_QUEUES];
 
   // The list of unfinished (= queued or running) job info indexed by job IDs.
-  typedef IDMap<JobInfo, IDMapOwnPointer> JobIDMap;
+  typedef IDMap<JobEntry, IDMapOwnPointer> JobIDMap;
   JobIDMap job_map_;
 
   // The list of observers for the scheduler.
   ObserverList<JobListObserver> observer_list_;
 
   google_apis::DriveServiceInterface* drive_service_;
   scoped_ptr<google_apis::DriveUploaderInterface> uploader_;
 
   Profile* profile_;
 
   // 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_