Get rid of RequestRegistry (part 2): remove cancellation methods.

chrome/browser/chromeos/drive/job_scheduler.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 
 #include <math.h>
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 151 matching lines @@
 }
 
 void JobScheduler::RemoveObserver(JobListObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observer_list_.RemoveObserver(observer);
 }
 
 void JobScheduler::CancelJob(JobID job_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // TODO(kinaba): Completely remove drive_service_->CancelForFilePath
-  // once DriveUploader supported cancellation callback: crbug.com/257012.
   JobEntry* job = job_map_.Lookup(job_id);
   if (job) {
+    // TODO(kinaba): crbug.com/251116 Support cancelling jobs not yet started.
     if (!job->cancel_callback.is_null())
       job->cancel_callback.Run();
-    else
-      drive_service_->CancelForFilePath(job->job_info.file_path);
   }
 }
 
 void JobScheduler::CancelAllJobs() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  // TODO(kinaba): Move the cancellation feature from DriveService
-  // to JobScheduler.
-  drive_service_->CancelAll();
+  // CancelJob may remove the entry from |job_map_|. That's OK. IDMap supports
+  // removable during iteration.
+  for (JobIDMap::iterator iter(&job_map_); !iter.IsAtEnd(); iter.Advance())
+    CancelJob(iter.GetCurrentKey());
 }
 
 void JobScheduler::GetAboutResource(
     const google_apis::GetAboutResourceCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   JobEntry* new_job = CreateNewJob(TYPE_GET_ABOUT_RESOURCE);
   new_job->task = base::Bind(
       &google_apis::DriveServiceInterface::GetAboutResource,
@@ skipping 787 matching lines @@
     case FILE_QUEUE:
       return "FILE_QUEUE";
     case NUM_QUEUES:
       break;  // This value is just a sentinel. Should never be used.
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive