gdata: Convert GDataFileSystem::AddUploadFile() to asynchronous.

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 55 matching lines @@
   // Create buffer to hold upload data.
   info->buf_len = std::min(info->file_size, kUploadChunkSize);
   info->buf = new net::IOBuffer(info->buf_len);
 
   OpenFile(info);
   return upload_id;
 }
 
 void GDataUploader::UpdateUpload(int upload_id,
                                  content::DownloadItem* download) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   UploadFileInfo* upload_file_info = GetUploadFileInfo(upload_id);
   if (!upload_file_info)
     return;
 
   const int64 file_size = download->GetReceivedBytes();
 
   // Update file_size and all_bytes_present.
   DVLOG(1) << "Updating file size from " << upload_file_info->file_size
            << " to " << file_size
            << (download->AllDataSaved() ? " (AllDataSaved)" : " (In-progress)");
@@ skipping 226 matching lines @@
   if (response.code == HTTP_CREATED) {
     DVLOG(1) << "Successfully created uploaded file=["
              << upload_file_info->title;
 
     // Done uploading.
     upload_file_info->entry = entry.Pass();
     if (!upload_file_info->completion_callback.is_null()) {
       upload_file_info->completion_callback.Run(base::PLATFORM_FILE_OK,
                                                 upload_file_info);
     }
-    // TODO(achuith): DeleteUpload() here and let clients call
-    // GDataFileSystem::AddUploadedFile.
+
+    // Remove |upload_id| from the UploadFileInfoMap. The UploadFileInfo object
+    // will be deleted later upon transfer completion.
+    RemoveUpload(upload_id);
     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.
@@ skipping 16 matching lines @@
 
   // Continue uploading.
   UploadNextChunk(upload_file_info);
 }
 
 void GDataUploader::MoveFileToCache(UploadFileInfo* upload_file_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (upload_file_info->entry == NULL)
     return;
 
+  int upload_id = upload_file_info->upload_id;

[achuithb, 2012/06/14 22:27:18]

nit: could we make this const?

[hshi1, 2012/06/15 00:16:28]

Done.

   DVLOG(1) << "MoveFileToCache " << upload_file_info->file_path.value();
   file_system_->AddUploadedFile(
       upload_file_info->gdata_path.DirName(),
       upload_file_info->entry.get(),
       upload_file_info->file_path,
-      GDataCache::FILE_OPERATION_MOVE);
-  DeleteUpload(upload_file_info);
+      GDataCache::FILE_OPERATION_MOVE,
+      base::Bind(&GDataUploader::OnAddUploadFileComplete,
+                 uploader_factory_.GetWeakPtr(),
+                 upload_file_info));
+
+  // Remove |upload_id| from the UploadFileInfoMap. The UploadFileInfo object
+  // will be deleted in OnAddUploadFileComplete.
+  RemoveUpload(upload_id);
+}
+
+void GDataUploader::OnAddUploadFileComplete(UploadFileInfo* upload_file_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  delete upload_file_info;
 }
 
 void GDataUploader::UploadFailed(UploadFileInfo* upload_file_info,
                                  base::PlatformFileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  int upload_id = upload_file_info->upload_id;

[achuithb, 2012/06/14 22:27:18]

nit: make this const

[hshi1, 2012/06/15 00:16:28]

Done.

   LOG(ERROR) << "Upload failed " << upload_file_info->DebugString();
   if (!upload_file_info->completion_callback.is_null()) {
     upload_file_info->completion_callback.Run(error,
                                               upload_file_info);
   }
-  DeleteUpload(upload_file_info);
-}
 
-void GDataUploader::DeleteUpload(UploadFileInfo* upload_file_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
-  DVLOG(1) << "Deleting upload " << upload_file_info->gdata_path.value();
-  pending_uploads_.erase(upload_file_info->upload_id);
-
-  // The file stream is closed by the destructor asynchronously.
-  delete upload_file_info->file_stream;
+  RemoveUpload(upload_id);
   delete upload_file_info;
 }
 
+void GDataUploader::RemoveUpload(int upload_id) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  pending_uploads_.erase(upload_id);
+}
+
 }  // namespace gdata