Index: chrome/browser/chromeos/drive/sync_client.cc |
diff --git a/chrome/browser/chromeos/drive/sync_client.cc b/chrome/browser/chromeos/drive/sync_client.cc |
index 51b2b422c2b9a35a312a38e2dcf5a81472d46aaf..36f37833e00e769701ebe2e0a4944b976dab5cff 100644 |
--- a/chrome/browser/chromeos/drive/sync_client.cc |
+++ b/chrome/browser/chromeos/drive/sync_client.cc |
@@ -11,7 +11,7 @@ |
#include "chrome/browser/chromeos/drive/drive.pb.h" |
#include "chrome/browser/chromeos/drive/file_cache.h" |
#include "chrome/browser/chromeos/drive/file_system/download_operation.h" |
-#include "chrome/browser/chromeos/drive/file_system/operation_observer.h" |
+#include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" |
#include "chrome/browser/chromeos/drive/file_system_util.h" |
#include "chrome/browser/chromeos/drive/job_scheduler.h" |
#include "chrome/browser/chromeos/drive/sync/entry_update_performer.h" |
@@ -139,25 +139,25 @@ SyncClient::SyncTask::SyncTask() |
SyncClient::SyncTask::~SyncTask() {} |
SyncClient::SyncClient(base::SequencedTaskRunner* blocking_task_runner, |
- file_system::OperationObserver* observer, |
+ file_system::OperationDelegate* delegate, |
JobScheduler* scheduler, |
ResourceMetadata* metadata, |
FileCache* cache, |
LoaderController* loader_controller, |
const base::FilePath& temporary_file_directory) |
: blocking_task_runner_(blocking_task_runner), |
- operation_observer_(observer), |
+ operation_delegate_(delegate), |
metadata_(metadata), |
cache_(cache), |
download_operation_(new file_system::DownloadOperation( |
blocking_task_runner, |
- observer, |
+ delegate, |
scheduler, |
metadata, |
cache, |
temporary_file_directory)), |
entry_update_performer_(new EntryUpdatePerformer(blocking_task_runner, |
- observer, |
+ delegate, |
scheduler, |
metadata, |
cache, |
@@ -443,11 +443,11 @@ void SyncClient::OnTaskComplete(SyncType type, |
it->second.should_run_again = true; |
it->second.context = ClientContext(BACKGROUND); |
retry_delay = long_delay_; |
- operation_observer_->OnDriveSyncError( |
+ operation_delegate_->OnDriveSyncError( |
file_system::DRIVE_SYNC_ERROR_SERVICE_UNAVAILABLE, local_id); |
break; |
default: |
- operation_observer_->OnDriveSyncError( |
+ operation_delegate_->OnDriveSyncError( |
file_system::DRIVE_SYNC_ERROR_MISC, local_id); |
LOG(WARNING) << "Failed: type = " << type << ", id = " << local_id |
<< ": " << FileErrorToString(error); |