drive: Also lock SearchOperation when locking ChangeListLoader

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"
@@ skipping 135 matching lines @@
 }
 
 }  // namespace
 
 EntryUpdatePerformer::EntryUpdatePerformer(
     base::SequencedTaskRunner* blocking_task_runner,
     file_system::OperationObserver* observer,
     JobScheduler* scheduler,
     ResourceMetadata* metadata,
     FileCache* cache,
-    ChangeListLoader* change_list_loader)
+    LoaderController* loader_controller)
     : blocking_task_runner_(blocking_task_runner),
       scheduler_(scheduler),
       metadata_(metadata),
       cache_(cache),
-      change_list_loader_(change_list_loader),
+      loader_controller_(loader_controller),
       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 40 matching lines @@
   }
 
   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) {
     if (local_state->entry.resource_id().empty()) {
+      // Lock the loader to avoid race conditions.
+      scoped_ptr<base::ScopedClosureRunner> loader_lock =
+          loader_controller_->GetLock();
+
       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())));
+                     base::Passed(&loader_lock)));
     } 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,
@@ skipping 24 matching lines @@
       base::Bind(&EntryUpdatePerformer::UpdateEntryAfterUpdateResource,
                  weak_ptr_factory_.GetWeakPtr(),
                  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,
+    scoped_ptr<base::ScopedClosureRunner> 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