Rename gdata_errorcode.h to drive_api_error_codes.h

chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
 
 #include "base/callback.h"
 #include "base/format_macros.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 126 matching lines @@
       "Detach %s from %s",
       target_file_id_.c_str(), parent_folder_id.c_str()));
 
   drive_service()->RemoveResourceFromDirectory(
       parent_folder_id, target_file_id_,
       base::Bind(&ConflictResolver::DidDetachFromParent,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&token)));
 }
 
-void ConflictResolver::DidDetachFromParent(scoped_ptr<SyncTaskToken> token,
-                                           google_apis::GDataErrorCode error) {
-  SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
+void ConflictResolver::DidDetachFromParent(
+    scoped_ptr<SyncTaskToken> token,
+    google_apis::DriveApiErrorCode error) {
+  SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK) {
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
   if (!parents_to_remove_.empty()) {
     DetachFromNonPrimaryParents(token.Pass());
     return;
   }
 
@@ skipping 81 matching lines @@
   // the folder identified by |target_file_id_|.
   drive_service()->DeleteResource(
       file_id, etag,
       base::Bind(&ConflictResolver::DidRemoveFile,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Passed(&token), file_id));
 }
 
 void ConflictResolver::DidRemoveFile(scoped_ptr<SyncTaskToken> token,
                                      const std::string& file_id,
-                                     google_apis::GDataErrorCode error) {
+                                     google_apis::DriveApiErrorCode error) {
   if (error == google_apis::HTTP_PRECONDITION ||
       error == google_apis::HTTP_CONFLICT) {
     UpdateFileMetadata(file_id, token.Pass());
     return;
   }
 
-  SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
+  SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK && error != google_apis::HTTP_NOT_FOUND) {
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
   deleted_file_ids_.push_back(file_id);
   if (!non_primary_file_ids_.empty()) {
     RemoveNonPrimaryFiles(token.Pass());
     return;
   }
@@ skipping 14 matching lines @@
   drive_service()->GetFileResource(
       file_id,
       base::Bind(&ConflictResolver::DidGetRemoteMetadata,
                  weak_ptr_factory_.GetWeakPtr(), file_id,
                  base::Passed(&token)));
 }
 
 void ConflictResolver::DidGetRemoteMetadata(
     const std::string& file_id,
     scoped_ptr<SyncTaskToken> token,
-    google_apis::GDataErrorCode error,
+    google_apis::DriveApiErrorCode error,
     scoped_ptr<google_apis::FileResource> entry) {
-  SyncStatusCode status = GDataErrorCodeToSyncStatusCode(error);
+  SyncStatusCode status = DriveApiErrorCodeToSyncStatusCode(error);
   if (status != SYNC_STATUS_OK && error != google_apis::HTTP_NOT_FOUND) {
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
 
   if (error != google_apis::HTTP_NOT_FOUND) {
     status = metadata_database()->UpdateByDeletedRemoteFile(file_id);
     SyncTaskManager::NotifyTaskDone(token.Pass(), status);
     return;
   }
@@ skipping 12 matching lines @@
   set_used_network(true);
   return sync_context_->GetDriveService();
 }
 
 MetadataDatabase* ConflictResolver::metadata_database() {
   return sync_context_->GetMetadataDatabase();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system