Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

chrome/browser/chromeos/gdata/gdata_uploader.cc

 // 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.
 
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 231 matching lines @@
                << "\" for reading: " << net::ErrorToString(result)
                << ", tries=" << upload_file_info->num_file_open_tries;
 
       // Stop trying to open this file if we exceed kMaxFileOpenTries.
       const bool exceeded_max_attempts =
           upload_file_info->num_file_open_tries >= kMaxFileOpenTries;
       upload_file_info->should_retry_file_open = !exceeded_max_attempts;
     }
     if (!upload_file_info->should_retry_file_open) {
       UploadFailed(scoped_ptr<UploadFileInfo>(upload_file_info),
-                   GDATA_FILE_ERROR_NOT_FOUND);
+                   DRIVE_FILE_ERROR_NOT_FOUND);
     }
     return;
   }
 
   // Open succeeded, initiate the upload.
   upload_file_info->should_retry_file_open = false;
   if (upload_file_info->initial_upload_location.is_empty()) {
     UploadFailed(scoped_ptr<UploadFileInfo>(upload_file_info),
-                 GDATA_FILE_ERROR_ABORT);
+                 DRIVE_FILE_ERROR_ABORT);
     return;
   }
   drive_service_->InitiateUpload(
       InitiateUploadParams(upload_file_info->upload_mode,
                            upload_file_info->title,
                            upload_file_info->content_type,
                            upload_file_info->content_length,
                            upload_file_info->initial_upload_location,
                            upload_file_info->gdata_path),
       base::Bind(&GDataUploader::OnUploadLocationReceived,
@@ skipping 10 matching lines @@
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
   if (!upload_file_info)
     return;
 
   DVLOG(1) << "Got upload location [" << upload_location.spec()
            << "] for [" << upload_file_info->title << "]";
 
   if (code != HTTP_SUCCESS) {
     // TODO(achuith): Handle error codes from Google Docs server.
     UploadFailed(scoped_ptr<UploadFileInfo>(upload_file_info),
-                 GDATA_FILE_ERROR_ABORT);
+                 DRIVE_FILE_ERROR_ABORT);
     return;
   }
 
   upload_file_info->upload_location = upload_location;
 
   // Start the upload from the beginning of the file.
   UploadNextChunk(upload_file_info);
 }
 
 void GDataUploader::UploadNextChunk(UploadFileInfo* upload_file_info) {
@@ skipping 115 matching lines @@
              << upload_file_info->title;
 
     // Remove |upload_id| from the UploadFileInfoMap. The UploadFileInfo object
     // will be deleted upon completion of completion_callback.
     RemoveUpload(upload_id);
 
     // Done uploading.
     upload_file_info->entry = entry.Pass();
     if (!upload_file_info->completion_callback.is_null()) {
       upload_file_info->completion_callback.Run(
-          GDATA_FILE_OK,
+          DRIVE_FILE_OK,
           scoped_ptr<UploadFileInfo>(upload_file_info));
     }
     return;
   }
 
   // If code is 308 (RESUME_INCOMPLETE) and range_received is what has been
   // previously uploaded (i.e. = upload_file_info->end_range), proceed to
   // upload the next chunk.
   if (response.code != HTTP_RESUME_INCOMPLETE ||
       response.start_range_received != 0 ||
       response.end_range_received != upload_file_info->end_range) {
     // TODO(achuith): Handle error cases, e.g.
     // - when previously uploaded data wasn't received by Google Docs server,
     //   i.e. when end_range_received < upload_file_info->end_range
     LOG(ERROR) << "UploadNextChunk http code=" << response.code
                << ", start_range_received=" << response.start_range_received
                << ", end_range_received=" << response.end_range_received
                << ", expected end range=" << upload_file_info->end_range;
     UploadFailed(
         scoped_ptr<UploadFileInfo>(upload_file_info),
         response.code == HTTP_FORBIDDEN ?
-            GDATA_FILE_ERROR_NO_SPACE :
-            GDATA_FILE_ERROR_ABORT);
+            DRIVE_FILE_ERROR_NO_SPACE :
+            DRIVE_FILE_ERROR_ABORT);
     return;
   }
 
   DVLOG(1) << "Received range " << response.start_range_received
            << "-" << response.end_range_received
            << " for [" << upload_file_info->title << "]";
 
   // Continue uploading.
   UploadNextChunk(upload_file_info);
 }
 
 void GDataUploader::UploadFailed(scoped_ptr<UploadFileInfo> upload_file_info,
-                                 GDataFileError error) {
+                                 DriveFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RemoveUpload(upload_file_info->upload_id);
 
   LOG(ERROR) << "Upload failed " << upload_file_info->DebugString();
   // This is subtle but we should take the callback reference before
   // calling upload_file_info.Pass(). Otherwise, it'll crash.
   const UploadFileInfo::UploadCompletionCallback& callback =
       upload_file_info->completion_callback;
   if (!callback.is_null())
     callback.Run(error, upload_file_info.Pass());
 }
 
 void GDataUploader::RemoveUpload(int upload_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pending_uploads_.erase(upload_id);
 }
 
 }  // namespace gdata