| Index: chrome/browser/chromeos/gdata/drive_system_service.h
|
| diff --git a/chrome/browser/chromeos/gdata/drive_system_service.h b/chrome/browser/chromeos/gdata/drive_system_service.h
|
| index e5bf5fc951f410f43bb7ff137f66b0c223a69411..0f04bf1835e0b6e6a471a851df83ab737aea3a20 100644
|
| --- a/chrome/browser/chromeos/gdata/drive_system_service.h
|
| +++ b/chrome/browser/chromeos/gdata/drive_system_service.h
|
| @@ -23,10 +23,10 @@ class DriveCache;
|
| class DriveDownloadObserver;
|
| class DriveFileSystemInterface;
|
| class DriveServiceInterface;
|
| +class DriveUploader;
|
| class DriveWebAppsRegistry;
|
| class FileWriteHelper;
|
| class GDataSyncClient;
|
| -class GDataUploader;
|
|
|
| // DriveSystemService runs the Drive system, including the Drive file system
|
| // implementation for the file manager, and some other sub systems.
|
| @@ -40,7 +40,7 @@ class DriveSystemService : public ProfileKeyedService {
|
| DriveCache* cache() { return cache_; }
|
| DriveFileSystemInterface* file_system() { return file_system_.get(); }
|
| FileWriteHelper* file_write_helper() { return file_write_helper_.get(); }
|
| - GDataUploader* uploader() { return uploader_.get(); }
|
| + DriveUploader* uploader() { return uploader_.get(); }
|
| DriveWebAppsRegistry* webapps_registry() { return webapps_registry_.get(); }
|
|
|
| // Clears all the local cache files and in-memory data, and remounts the file
|
| @@ -76,7 +76,7 @@ class DriveSystemService : public ProfileKeyedService {
|
| scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
|
| DriveCache* cache_;
|
| scoped_ptr<DriveServiceInterface> drive_service_;
|
| - scoped_ptr<GDataUploader> uploader_;
|
| + scoped_ptr<DriveUploader> uploader_;
|
| scoped_ptr<DriveWebAppsRegistry> webapps_registry_;
|
| scoped_ptr<DriveFileSystemInterface> file_system_;
|
| scoped_ptr<FileWriteHelper> file_write_helper_;
|
|
|