Narrow the ownership of DriveUploader from DriveSystemService to DriveScheduler.

chrome/browser/chromeos/drive/drive_system_service.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_SYSTEM_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_file_error.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "sync/notifier/invalidation_handler.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace google_apis {
 class DriveServiceInterface;
-class DriveUploader;
 }
 
 namespace drive {
 
 class DriveCache;
 class DriveDownloadHandler;
 class DriveFileSystemInterface;
 class DriveFileSystemProxy;
 class DriveWebAppsRegistry;
 class DriveSyncClient;
@@ skipping 29 matching lines @@
   virtual void Shutdown() OVERRIDE;
 
   google_apis::DriveServiceInterface* drive_service() {
     return drive_service_.get();
   }
 
   DriveCache* cache() { return cache_.get(); }
   DriveFileSystemInterface* file_system() { return file_system_.get(); }
   FileWriteHelper* file_write_helper() { return file_write_helper_.get(); }
   DriveDownloadHandler* download_handler() { return download_handler_.get(); }
-  google_apis::DriveUploader* uploader() { return uploader_.get(); }
   DriveWebAppsRegistry* webapps_registry() { return webapps_registry_.get(); }
   EventLogger* event_logger() { return event_logger_.get(); }
 
   // Clears all the local cache files and in-memory data, and remounts the
   // file system. |callback| is called with true when this operation is done
   // successfully. Otherwise, |callback| is called with false.
   // |callback| must not be null.
   void ClearCacheAndRemountFileSystem(
       const base::Callback<void(bool)>& callback);
 
@@ skipping 46 matching lines @@
   // True if Drive is disabled due to initialization errors.
   bool drive_disabled_;
 
   // True once this is registered to listen to the Drive updates.
   bool push_notification_registered_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   scoped_ptr<EventLogger> event_logger_;
   scoped_ptr<DriveCache, util::DestroyHelper> cache_;
   scoped_ptr<google_apis::DriveServiceInterface> drive_service_;
-  scoped_ptr<google_apis::DriveUploader> uploader_;
   scoped_ptr<DriveWebAppsRegistry> webapps_registry_;
   scoped_ptr<DriveResourceMetadata, util::DestroyHelper> resource_metadata_;
   scoped_ptr<DriveFileSystemInterface> file_system_;
   scoped_ptr<FileWriteHelper> file_write_helper_;
   scoped_ptr<DriveDownloadHandler> download_handler_;
   scoped_ptr<DriveSyncClient> sync_client_;
   scoped_ptr<DrivePrefetcher> prefetcher_;
   scoped_ptr<StaleCacheFilesRemover> stale_cache_files_remover_;
   scoped_refptr<DriveFileSystemProxy> file_system_proxy_;
 
@@ skipping 49 matching lines @@
   // ProfileKeyedServiceFactory:
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
 
   FactoryCallback factory_for_test_;
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_SYSTEM_SERVICE_H_