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

chrome/browser/chromeos/gdata/gdata_file_system.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_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 1159 matching lines @@
 
 void GDataFileSystem::OnTransferCompleted(
     const FileOperationCallback& callback,
     base::PlatformFileError error,
     UploadFileInfo* upload_file_info) {
   DCHECK(upload_file_info);
   if (error == base::PLATFORM_FILE_OK && upload_file_info->entry.get()) {
     AddUploadedFile(upload_file_info->gdata_path.DirName(),
                     upload_file_info->entry.get(),
                     upload_file_info->file_path,
-                    GDataCache::FILE_OPERATION_COPY);
+                    GDataCache::FILE_OPERATION_COPY,
+                    base::Bind(&GDataFileSystem::OnAddUploadFileCompleted,
+                               ui_weak_ptr_,
+                               callback,
+                               error,
+                               upload_file_info));
+  } else {

[satorux1, 2012/06/14 20:30:06]

maybe:

else if (upload_file_info->entry.get()) {

[hshi1, 2012/06/14 20:47:27]

In the original code there is no such check; even if
upload_file_info->entry.get() == NULL the code would still execute the callback.

On 2012/06/14 20:30:06, satorux1 wrote:

+    OnAddUploadFileCompleted(callback, error, upload_file_info);
   }
+}
+
+void GDataFileSystem::OnAddUploadFileCompleted(
+    const FileOperationCallback& callback,
+    base::PlatformFileError error,
+    UploadFileInfo* upload_file_info) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
   if (!callback.is_null())
     callback.Run(error);
 
   // In case of error upload_file_info will be deleted by the uploader.
   if (error != base::PLATFORM_FILE_OK)
     return;
 
-  // TODO(achuith): GDataFileSystem should not have to call DeleteUpload.
-  GDataSystemService* service =
-      GDataSystemServiceFactory::GetForProfile(profile_);
-  if (service)
-    service->uploader()->DeleteUpload(upload_file_info);
+  delete upload_file_info;
 }
 
 void GDataFileSystem::Copy(const FilePath& src_file_path,
                            const FilePath& dest_file_path,
                            const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(base::Bind(&GDataFileSystem::CopyOnUIThread,
                                ui_weak_ptr_,
                                src_file_path,
@@ skipping 2319 matching lines @@
     return base::PLATFORM_FILE_ERROR_NOT_FOUND;
 
   NotifyDirectoryChanged(parent_dir->GetFilePath());
   return base::PLATFORM_FILE_OK;
 }
 
 void GDataFileSystem::AddUploadedFile(
     const FilePath& virtual_dir_path,
     DocumentEntry* entry,
     const FilePath& file_content_path,
-    GDataCache::FileOperationType cache_operation) {
+    GDataCache::FileOperationType cache_operation,
+    const base::Closure& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  // Post a task to the same thread, rather than calling it here, as
+  // AddUploadedFile() is asynchronous.
+  base::MessageLoopProxy::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&GDataFileSystem::AddUploadedFileOnUIThread,
+                 ui_weak_ptr_,
+                 virtual_dir_path,
+                 entry,
+                 file_content_path,
+                 cache_operation,
+                 callback));
+}
+
+void GDataFileSystem::AddUploadedFileOnUIThread(
+    const FilePath& virtual_dir_path,
+    DocumentEntry* entry,
+    const FilePath& file_content_path,
+    GDataCache::FileOperationType cache_operation,
+    const base::Closure& callback) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(!callback.is_null());
+
   if (!entry) {
     NOTREACHED();
+    callback.Run();
     return;
   }
 
   std::string resource_id;
   std::string md5;
   {
     base::AutoLock lock(lock_);
     GDataEntry* dir_entry = GetGDataEntryByPath(virtual_dir_path);
-    if (!dir_entry)
+    if (!dir_entry) {
+      callback.Run();
       return;
+    }
 
     GDataDirectory* parent_dir  = dir_entry->AsGDataDirectory();
-    if (!parent_dir)
+    if (!parent_dir) {
+      callback.Run();
       return;
+    }
 
     scoped_ptr<GDataEntry> new_entry(
         GDataEntry::FromDocumentEntry(parent_dir, entry, root_.get()));
-    if (!new_entry.get())
+    if (!new_entry.get()) {
+      callback.Run();
       return;
+    }
 
     GDataFile* file = new_entry->AsGDataFile();
     DCHECK(file);
     resource_id = file->resource_id();
     md5 = file->file_md5();
     parent_dir->AddEntry(new_entry.release());
   }
   NotifyDirectoryChanged(virtual_dir_path);
 
   StoreToCache(resource_id, md5, file_content_path, cache_operation,
                CacheOperationCallback());
+  callback.Run();

[satorux1, 2012/06/14 20:30:06]

Should we run the callback here? StoreToCache() is asynchronous hence returns
immediately. Shouldn't we run |callback| upon the completion of StoreToCache()?

[hshi1, 2012/06/14 20:47:27]

You're right, does the new patch set work?

On 2012/06/14 20:30:06, satorux1 wrote:

 }
 
 void GDataFileSystem::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     PrefService* pref_service = profile_->GetPrefs();
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kDisableGDataHostedFiles) {
       SetHideHostedDocuments(
@@ skipping 574 matching lines @@
     base::PlatformFileError error,
     const std::string& resource_id,
     const std::string& md5) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!callback.is_null())
     callback.Run(error);
 }
 
 }  // namespace gdata