Support cancellation of non-yet-running jobs in drive::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 190 matching lines @@
     ClientContext context;
 
     // The number of times the jobs is retried due to server errors.
     int retry_count;
 
     // The callback to start the job. Called each time it is retry.
     base::Callback<google_apis::CancelCallback()> task;
 
     // The callback to cancel the running job. It is returned from task.Run().
     google_apis::CancelCallback cancel_callback;
+
+    // The callback to notify an error to the client of JobScheduler.
+    // This is used to notify cancel of a job that is not running yet.
+    base::Callback<void(google_apis::GDataErrorCode)> abort;

[hashimoto, 2013/06/20 03:51:54]

nit: Can we make this variable's name a noun? (e.g. abort_callback)

[kinaba, 2013/06/21 01:59:22]

Done.

   };
 
   // Parameters for DriveUploader::ResumeUploadFile.
   struct ResumeUploadParams;
 
   // Creates a new job and add it to the job map.
   JobEntry* CreateNewJob(JobType type);
 
   // Adds the specified job to the queue and starts the job loop for the queue
   // if needed.
@@ skipping 118 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_