Rename gdata_errorcode.h to drive_api_error_codes.h

chrome/browser/sync_file_system/drive_backend/conflict_resolver.h

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
index 2c9d4e2727f9a06efd33434ff9b3eb16d14c7343..e0cfef747befef3c3fe960cb02972f9ef7cead3f 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.h
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sync_file_system/drive_backend/sync_task.h"
 #include "chrome/browser/sync_file_system/sync_callbacks.h"
-#include "google_apis/drive/gdata_errorcode.h"
+#include "google_apis/drive/drive_api_error_codes.h"
 
 namespace drive {
 class DriveServiceInterface;
@@ -50,19 +50,19 @@ class ConflictResolver : public SyncTask {
 
   void DetachFromNonPrimaryParents(scoped_ptr<SyncTaskToken> token);
   void DidDetachFromParent(scoped_ptr<SyncTaskToken> token,
-                           google_apis::GDataErrorCode error);
+                           google_apis::DriveApiErrorCode error);
 
   std::string PickPrimaryFile(const TrackerIDSet& trackers);
   void RemoveNonPrimaryFiles(scoped_ptr<SyncTaskToken> token);
   void DidRemoveFile(scoped_ptr<SyncTaskToken> token,
                      const std::string& file_id,
-                     google_apis::GDataErrorCode error);
+                     google_apis::DriveApiErrorCode error);
 
   void UpdateFileMetadata(const std::string& file_id,
                           scoped_ptr<SyncTaskToken> token);
   void DidGetRemoteMetadata(const std::string& file_id,
                             scoped_ptr<SyncTaskToken> token,
-                            google_apis::GDataErrorCode error,
+                            google_apis::DriveApiErrorCode error,
                             scoped_ptr<google_apis::FileResource> entry);
 
   std::string target_file_id_;