Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler.

chrome/browser/chromeos/drive/drive_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_DRIVE_SCHEDULER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SCHEDULER_H_
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 62 matching lines @@
     int total_bytes;
 
     // Drive path of the file that this job acts on.
     base::FilePath file_path;
 
     // Current state of the operation.
     JobState state;
   };
 
   DriveScheduler(Profile* profile,
-                 google_apis::DriveServiceInterface* drive_service,
-                 google_apis::DriveUploaderInterface* uploader);
+                 google_apis::DriveServiceInterface* drive_service);
   virtual ~DriveScheduler();
 
   // Initializes the object. This function should be called before any
   // other functions.
   void Initialize();
 
   // Adds a GetAccountMetadata operation to the queue.
   // |callback| must not be null.
   void GetAccountMetadata(
       const google_apis::GetAccountMetadataCallback& callback);
@@ skipping 298 matching lines @@
   // next task.
   int throttle_count_;
 
   // Disables throttling for testing.
   bool disable_throttling_;
 
   // The queues of jobs.
   std::list<QueueEntry*> queue_[NUM_QUEUES];
 
   google_apis::DriveServiceInterface* drive_service_;
-  google_apis::DriveUploaderInterface* uploader_;
+  scoped_ptr<google_apis::DriveUploaderInterface> uploader_;
 
   Profile* profile_;
 
   // Whether this instance is initialized or not.
   bool initialized_;
 
   // 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<DriveScheduler> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(DriveScheduler);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SCHEDULER_H_