Rename gdata_errorcode.h to drive_api_error_codes.h

chrome/browser/sync_file_system/drive_backend/conflict_resolver.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #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;
 }
 
 namespace google_apis {
 class FileResource;
 }
 
 namespace sync_file_system {
@@ skipping 16 matching lines @@
   explicit ConflictResolver(SyncEngineContext* sync_context);
   ~ConflictResolver() override;
   void RunPreflight(scoped_ptr<SyncTaskToken> token) override;
   void RunExclusive(scoped_ptr<SyncTaskToken> token);
 
  private:
   typedef std::pair<std::string, std::string> FileIDAndETag;
 
   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_;
   std::vector<std::string> parents_to_remove_;
 
   std::vector<FileIDAndETag> non_primary_file_ids_;
   FileIDList deleted_file_ids_;
 
   bool IsContextReady();
   drive::DriveServiceInterface* drive_service();
   MetadataDatabase* metadata_database();
 
   SyncEngineContext* sync_context_;  // Not owned.
 
   base::WeakPtrFactory<ConflictResolver> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictResolver);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CONFLICT_RESOLVER_H_