Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_uploader.h

 // Copyright (c) 2012 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_CHROMEOS_GDATA_GDATA_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "base/platform_file.h"
-#include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
+#include "chrome/browser/chromeos/gdata/drive_errorcode.h"
 #include "chrome/browser/chromeos/gdata/gdata_operations.h"
 #include "chrome/browser/chromeos/gdata/gdata_upload_file_info.h"
 #include "googleurl/src/gurl.h"
 
 namespace content {
 class DownloadItem;
 }
 
 namespace gdata {
 
@@ skipping 64 matching lines @@
 
   // Open the file.
   void OpenFile(UploadFileInfo* upload_file_info);
 
   // net::FileStream::Open completion callback. The result of the file
   // open operation is passed as |result|.
   void OpenCompletionCallback(int upload_id, int result);
 
   // DriveService callback for InitiateUpload.
   void OnUploadLocationReceived(int upload_id,
-                                GDataErrorCode code,
+                                DriveErrorCode code,
                                 const GURL& upload_location);
 
   // Uploads the next chunk of data from the file.
   void UploadNextChunk(UploadFileInfo* upload_file_info);
 
   // net::FileStream::Read completion callback.
   void ReadCompletionCallback(int upload_id,
       int bytes_to_read,
       int bytes_read);
 
   // Calls DriveService's ResumeUpload with the current upload info.
   void ResumeUpload(int upload_id);
 
   // DriveService callback for ResumeUpload.
   void OnResumeUploadResponseReceived(int upload_id,
                                       const ResumeUploadResponse& response,
                                       scoped_ptr<DocumentEntry> entry);
 
   // Initiate the upload.
   void InitiateUpload(UploadFileInfo* uploader_file_info);
 
   // Handle failed uploads.
   void UploadFailed(scoped_ptr<UploadFileInfo> upload_file_info,
-                    GDataFileError error);
+                    DriveFileError error);
 
   // Removes |upload_id| from UploadFileInfoMap |pending_uploads_|.
   // Note that this does not delete the UploadFileInfo object itself,
   // because it may still be in use by an asynchronous function.
   void RemoveUpload(int upload_id);
 
   // Starts uploading a file with |upload_file_info|. Returns a new upload
   // ID assigned to |upload_file_info|.
   int StartUploadFile(scoped_ptr<UploadFileInfo> upload_file_info);
 
@@ skipping 10 matching lines @@
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<GDataUploader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataUploader);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_UPLOADER_H_