Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler.

chrome/browser/chromeos/drive/drive_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/drive_scheduler.h"
 
 #include <math.h>
 
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 39 matching lines @@
 }
 
 bool DriveScheduler::QueueEntry::Compare(
     const DriveScheduler::QueueEntry* left,
     const DriveScheduler::QueueEntry* right) {
   return (left->context.type < right->context.type);
 }
 
 DriveScheduler::DriveScheduler(
     Profile* profile,
-    google_apis::DriveServiceInterface* drive_service,
-    google_apis::DriveUploaderInterface* uploader)
+    google_apis::DriveServiceInterface* drive_service)
     : next_job_id_(0),
       throttle_count_(0),
       disable_throttling_(false),
       drive_service_(drive_service),
-      uploader_(uploader),
+      uploader_(new google_apis::DriveUploader(drive_service)),
       profile_(profile),
       initialized_(false),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (int i = 0; i < NUM_QUEUES; ++i) {
     jobs_running_[i] = 0;
   }
 }
 
 DriveScheduler::~DriveScheduler() {
@@ skipping 733 matching lines @@
     case TYPE_DOWNLOAD_FILE:
     case TYPE_UPLOAD_NEW_FILE:
     case TYPE_UPLOAD_EXISTING_FILE:
       return FILE_QUEUE;
   }
   NOTREACHED();
   return FILE_QUEUE;
 }
 
 }  // namespace drive