| Index: chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| index e135417b7b0d37c4a01fe230a2d41b57377bf1af..d8428eb4214b8fc7d93d8ae4f56fb908f48b8a8d 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
|
| @@ -476,8 +476,8 @@ void LocalToRemoteSyncer::DeleteRemoteFile(scoped_ptr<SyncTaskToken> token) {
|
|
|
| void LocalToRemoteSyncer::DidDeleteRemoteFile(
|
| scoped_ptr<SyncTaskToken> token,
|
| - google_apis::GDataErrorCode error) {
|
| - SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
|
| + google_apis::DriveApiErrorCode error) {
|
| + SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK &&
|
| error != google_apis::HTTP_NOT_FOUND &&
|
| error != google_apis::HTTP_PRECONDITION &&
|
| @@ -530,7 +530,7 @@ void LocalToRemoteSyncer::UploadExistingFile(scoped_ptr<SyncTaskToken> token) {
|
|
|
| void LocalToRemoteSyncer::DidUploadExistingFile(
|
| scoped_ptr<SyncTaskToken> token,
|
| - google_apis::GDataErrorCode error,
|
| + google_apis::DriveApiErrorCode error,
|
| const GURL&,
|
| scoped_ptr<google_apis::FileResource> entry) {
|
| if (error == google_apis::HTTP_PRECONDITION ||
|
| @@ -548,7 +548,7 @@ void LocalToRemoteSyncer::DidUploadExistingFile(
|
| return;
|
| }
|
|
|
| - SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
|
| + SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK) {
|
| SyncCompleted(token.Pass(), status);
|
| return;
|
| @@ -606,7 +606,7 @@ void LocalToRemoteSyncer::UpdateRemoteMetadata(
|
| void LocalToRemoteSyncer::DidGetRemoteMetadata(
|
| const std::string& file_id,
|
| scoped_ptr<SyncTaskToken> token,
|
| - google_apis::GDataErrorCode error,
|
| + google_apis::DriveApiErrorCode error,
|
| scoped_ptr<google_apis::FileResource> entry) {
|
| DCHECK(sync_context_->GetWorkerTaskRunner()->RunsTasksOnCurrentThread());
|
|
|
| @@ -618,7 +618,7 @@ void LocalToRemoteSyncer::DidGetRemoteMetadata(
|
| return;
|
| }
|
|
|
| - SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
|
| + SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK) {
|
| SyncCompleted(token.Pass(), status);
|
| return;
|
| @@ -655,13 +655,13 @@ void LocalToRemoteSyncer::UploadNewFile(scoped_ptr<SyncTaskToken> token) {
|
|
|
| void LocalToRemoteSyncer::DidUploadNewFile(
|
| scoped_ptr<SyncTaskToken> token,
|
| - google_apis::GDataErrorCode error,
|
| + google_apis::DriveApiErrorCode error,
|
| const GURL& upload_location,
|
| scoped_ptr<google_apis::FileResource> entry) {
|
| if (error == google_apis::HTTP_NOT_FOUND)
|
| needs_remote_change_listing_ = true;
|
|
|
| - SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
|
| + SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK) {
|
| SyncCompleted(token.Pass(), status);
|
| return;
|
| @@ -736,8 +736,8 @@ void LocalToRemoteSyncer::DidCreateRemoteFolder(
|
|
|
| void LocalToRemoteSyncer::DidDetachResourceForCreationConflict(
|
| scoped_ptr<SyncTaskToken> token,
|
| - google_apis::GDataErrorCode error) {
|
| - SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
|
| + google_apis::DriveApiErrorCode error) {
|
| + SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
|
| if (status != SYNC_STATUS_OK) {
|
| SyncCompleted(token.Pass(), status);
|
| return;
|
|
|