Revert of Revert of Drive: Let DriveUploader use batch request API.

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 <algorithm>
+
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 718 matching lines @@
 }
 
 void JobScheduler::QueueJob(JobID job_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   JobEntry* job_entry = job_map_.Lookup(job_id);
   DCHECK(job_entry);
   const JobInfo& job_info = job_entry->job_info;
 
   const QueueType queue_type = GetJobQueueType(job_info.job_type);
-  queue_[queue_type]->Push(job_id, job_entry->context.type, false,
+  const bool batchable = job_info.job_type == TYPE_UPLOAD_EXISTING_FILE ||
+                         job_info.job_type == TYPE_UPLOAD_NEW_FILE;
+  queue_[queue_type]->Push(job_id, job_entry->context.type, batchable,
                            job_info.num_total_bytes);
 
   // Temporary histogram for crbug.com/229650.
   if (job_info.job_type == TYPE_DOWNLOAD_FILE ||
       job_info.job_type == TYPE_UPLOAD_EXISTING_FILE ||
       job_info.job_type == TYPE_UPLOAD_NEW_FILE) {
     std::vector<JobID> jobs_with_the_same_priority;
     queue_[queue_type]->GetQueuedJobs(job_entry->context.type,
                                       &jobs_with_the_same_priority);
     DCHECK(!jobs_with_the_same_priority.empty());
@@ skipping 39 matching lines @@
         wait_until_ - now);
     return;
   }
 
   // Run the job with the highest priority in the queue.
   std::vector<JobID> job_ids;
   queue_[queue_type]->PopForRun(accepted_priority, &job_ids);
   if (job_ids.empty())
     return;
 
-  // TODO(hirono): Currently all requests are not batchable. So the queue always
-  // return just 1 job.
-  DCHECK_EQ(1u, job_ids.size());
-  JobEntry* entry = job_map_.Lookup(job_ids.front());
-  DCHECK(entry);
+  if (job_ids.size() > 1)
+    uploader_->StartBatchProcessing();
 
-  JobInfo* job_info = &entry->job_info;
-  job_info->state = STATE_RUNNING;
-  job_info->start_time = now;
-  NotifyJobUpdated(*job_info);
+  for (JobID job_id : job_ids) {
+    JobEntry* entry = job_map_.Lookup(job_id);
+    DCHECK(entry);
 
-  entry->cancel_callback = entry->task.Run();
+    JobInfo* job_info = &entry->job_info;
+    job_info->state = STATE_RUNNING;
+    job_info->start_time = now;
+    NotifyJobUpdated(*job_info);
+
+    entry->cancel_callback = entry->task.Run();
+    logger_->Log(logging::LOG_INFO, "Job started: %s - %s",
+                 job_info->ToString().c_str(),
+                 GetQueueInfo(queue_type).c_str());
+  }
+
+  if (job_ids.size() > 1)
+    uploader_->StopBatchProcessing();
 
   UpdateWait();
-
-  logger_->Log(logging::LOG_INFO,
-               "Job started: %s - %s",
-               job_info->ToString().c_str(),
-               GetQueueInfo(queue_type).c_str());
 }
 
 int JobScheduler::GetCurrentAcceptedPriority(QueueType queue_type) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const int kNoJobShouldRun = -1;
 
   // Should stop if Drive was disabled while running the fetch loop.
   if (pref_service_->GetBoolean(prefs::kDisableDrive))
     return kNoJobShouldRun;
@@ skipping 344 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