drive: Use UploadNewFile from EntryUpdatePerformer

chrome/browser/chromeos/drive/sync/entry_update_performer.cc

 // 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.
 
 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"
 
+#include "base/callback_helpers.h"
+#include "base/file_util.h"
+#include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
 #include "chrome/browser/chromeos/drive/sync/entry_revert_performer.h"
 #include "chrome/browser/chromeos/drive/sync/remove_performer.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ skipping 26 matching lines @@
 
   error = metadata->GetResourceEntryById(local_state->entry.parent_local_id(),
                                          &local_state->parent_entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   local_state->drive_file_path = metadata->GetFilePath(local_id);
   if (local_state->drive_file_path.empty())
     return FILE_ERROR_NOT_FOUND;
 
   // Check if content update is needed or not.

[kinaba, 2014/01/28 08:46:08]

nit: this comment should be moved below.

[hashimoto, 2014/01/28 08:55:46]

Done.

   FileCacheEntry cache_entry;
-  if (cache->GetCacheEntry(local_id, &cache_entry) &&
-      cache_entry.is_dirty() &&
-      !cache->IsOpenedForWrite(local_id)) {
+  cache->GetCacheEntry(local_id, &cache_entry);
+  if (!cache_entry.is_present() && local_state->entry.resource_id().empty()) {
+    // Locally created file with no cache file, store an empty file.
+    base::FilePath empty_file;
+    if (!base::CreateTemporaryFile(&empty_file))
+      return FILE_ERROR_FAILED;
+    error = cache->Store(local_id, std::string(), empty_file,
+                         FileCache::FILE_OPERATION_MOVE);
+    if (error != FILE_ERROR_OK)
+      return error;
+    if (!cache->GetCacheEntry(local_id, &cache_entry))
+      return FILE_ERROR_NOT_FOUND;
+  }
+  if (cache_entry.is_dirty() && !cache->IsOpenedForWrite(local_id)) {
     // Update cache entry's MD5 if needed.
     if (cache_entry.md5().empty()) {
       error = cache->UpdateMd5(local_id);
       if (error != FILE_ERROR_OK)
         return error;
       if (!cache->GetCacheEntry(local_id, &cache_entry))
         return FILE_ERROR_NOT_FOUND;
     }
 
     if (cache_entry.md5() == local_state->entry.file_specific_info().md5()) {
@@ skipping 39 matching lines @@
     case ResourceEntry::CLEAN:  // Nothing to do.
     case ResourceEntry::DIRTY:  // Entry was edited again during the update.
       break;
 
     case ResourceEntry::SYNCING:
       entry.set_metadata_edit_state(ResourceEntry::CLEAN);
       break;
   }
   if (!entry.file_info().is_directory())
     entry.mutable_file_specific_info()->set_md5(resource_entry->file_md5());
+  entry.set_resource_id(resource_entry->resource_id());
   error = metadata->RefreshEntry(entry);
   if (error != FILE_ERROR_OK)
     return error;
 
   // Clear dirty bit unless the file has been edited during update.
   FileCacheEntry cache_entry;
   if (cache->GetCacheEntry(local_id, &cache_entry) &&
       cache_entry.md5() == entry.file_specific_info().md5()) {
     error = cache->ClearDirty(local_id);
     if (error != FILE_ERROR_OK)
       return error;
   }
   return FILE_ERROR_OK;
 }
 
 }  // namespace
 
 EntryUpdatePerformer::EntryUpdatePerformer(
     base::SequencedTaskRunner* blocking_task_runner,
     file_system::OperationObserver* observer,
     JobScheduler* scheduler,
     ResourceMetadata* metadata,
-    FileCache* cache)
+    FileCache* cache,
+    ChangeListLoader* change_list_loader)
     : blocking_task_runner_(blocking_task_runner),
       scheduler_(scheduler),
       metadata_(metadata),
       cache_(cache),
+      change_list_loader_(change_list_loader),
       remove_performer_(new RemovePerformer(blocking_task_runner,
                                             observer,
                                             scheduler,
                                             metadata)),
       entry_revert_performer_(new EntryRevertPerformer(blocking_task_runner,
                                                        observer,
                                                        scheduler,
                                                        metadata)),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 39 matching lines @@
     return;
   }
 
   base::Time last_modified = base::Time::FromInternalValue(
       local_state->entry.file_info().last_modified());
   base::Time last_accessed = base::Time::FromInternalValue(
       local_state->entry.file_info().last_accessed());
 
   // Perform content update.
   if (local_state->should_content_update) {
-    drive::DriveUploader::UploadExistingFileOptions options;
-    options.title = local_state->entry.title();
-    options.parent_resource_id = local_state->parent_entry.resource_id();
-    options.modified_date = last_modified;
-    options.last_viewed_by_me_date = last_accessed;
-    scheduler_->UploadExistingFile(
-        local_state->entry.resource_id(),
-        local_state->drive_file_path,
-        local_state->cache_file_path,
-        local_state->entry.file_specific_info().content_mime_type(),
-        options,
-        context,
-        base::Bind(&EntryUpdatePerformer::UpdateEntryAfterUpdateResource,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   context,
-                   callback,
-                   local_state->entry.local_id()));
+    if (local_state->entry.resource_id().empty()) {
+      drive::DriveUploader::UploadNewFileOptions options;
+      options.modified_date = last_modified;
+      options.last_viewed_by_me_date = last_accessed;
+      scheduler_->UploadNewFile(
+          local_state->parent_entry.resource_id(),
+          local_state->drive_file_path,
+          local_state->cache_file_path,
+          local_state->entry.title(),
+          local_state->entry.file_specific_info().content_mime_type(),
+          options,
+          context,
+          base::Bind(&EntryUpdatePerformer::UpdateEntryAfterUpdateResource,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     context,
+                     callback,
+                     local_state->entry.local_id(),
+                     base::Passed(change_list_loader_->GetLock())));
+    } else {
+      drive::DriveUploader::UploadExistingFileOptions options;
+      options.title = local_state->entry.title();
+      options.parent_resource_id = local_state->parent_entry.resource_id();
+      options.modified_date = last_modified;
+      options.last_viewed_by_me_date = last_accessed;
+      scheduler_->UploadExistingFile(
+          local_state->entry.resource_id(),
+          local_state->drive_file_path,
+          local_state->cache_file_path,
+          local_state->entry.file_specific_info().content_mime_type(),
+          options,
+          context,
+          base::Bind(&EntryUpdatePerformer::UpdateEntryAfterUpdateResource,
+                     weak_ptr_factory_.GetWeakPtr(),
+                     context,
+                     callback,
+                     local_state->entry.local_id(),
+                     base::Passed(scoped_ptr<base::ScopedClosureRunner>())));
+    }
     return;
   }
 
   // No need to perform update.
   if (local_state->entry.metadata_edit_state() == ResourceEntry::CLEAN) {
     callback.Run(FILE_ERROR_OK);
     return;
   }
 
   // Perform metadata update.
   scheduler_->UpdateResource(
       local_state->entry.resource_id(), local_state->parent_entry.resource_id(),
       local_state->entry.title(), last_modified, last_accessed,
       context,
       base::Bind(&EntryUpdatePerformer::UpdateEntryAfterUpdateResource,
                  weak_ptr_factory_.GetWeakPtr(),
-                 context, callback, local_state->entry.local_id()));
+                 context, callback, local_state->entry.local_id(),
+                 base::Passed(scoped_ptr<base::ScopedClosureRunner>())));
 }
 
 void EntryUpdatePerformer::UpdateEntryAfterUpdateResource(
     const ClientContext& context,
     const FileOperationCallback& callback,
     const std::string& local_id,
+    scoped_ptr<base::ScopedClosureRunner> change_list_loader_lock,
     google_apis::GDataErrorCode status,
     scoped_ptr<google_apis::ResourceEntry> resource_entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (status == google_apis::HTTP_FORBIDDEN) {
     // Editing this entry is not allowed, revert local changes.
     entry_revert_performer_->RevertEntry(local_id, context, callback);
     return;
   }
 
   FileError error = GDataToFileError(status);
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&FinishUpdate,
                  metadata_, cache_, local_id, base::Passed(&resource_entry)),
       callback);
 }
 
 }  // namespace internal
 }  // namespace drive