| Index: chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| index 93198c33155bad65944d62c32d149d33698f3449..ac4793efa0dded8bef19883928f4876e93cc1790 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
|
| @@ -237,7 +237,7 @@ void SyncEngine::AppendDependsOnFactories(
|
|
|
| SyncEngine::~SyncEngine() {
|
| net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
|
| - GetDriveService()->RemoveObserver(this);
|
| + drive_service_->RemoveObserver(this);
|
| if (notification_manager_)
|
| notification_manager_->RemoveObserver(this);
|
|
|
| @@ -290,7 +290,7 @@ void SyncEngine::Initialize(const base::FilePath& base_dir,
|
|
|
| if (notification_manager_)
|
| notification_manager_->AddObserver(this);
|
| - GetDriveService()->AddObserver(this);
|
| + drive_service_->AddObserver(this);
|
| net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
|
| }
|
|
|
| @@ -509,14 +509,6 @@ void SyncEngine::OnNetworkChanged(
|
| type));
|
| }
|
|
|
| -drive::DriveServiceInterface* SyncEngine::GetDriveService() {
|
| - return drive_service_.get();
|
| -}
|
| -
|
| -drive::DriveUploaderInterface* SyncEngine::GetDriveUploader() {
|
| - return drive_uploader_.get();
|
| -}
|
| -
|
| SyncEngine::SyncEngine(
|
| scoped_ptr<drive::DriveServiceInterface> drive_service,
|
| scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
|
|
|