drive: Also lock SearchOperation when locking ChangeListLoader

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

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 15 matching lines @@
 class JobScheduler;
 class ResourceEntry;
 struct ClientContext;
 
 namespace file_system {
 class OperationObserver;
 }  // namespace file_system
 
 namespace internal {
 
-class ChangeListLoader;
 class EntryRevertPerformer;
 class FileCache;
+class LoaderController;
 class RemovePerformer;
 class ResourceMetadata;
 
 // This class is responsible to perform server side update of an entry.
 class EntryUpdatePerformer {
  public:
   EntryUpdatePerformer(base::SequencedTaskRunner* blocking_task_runner,
                        file_system::OperationObserver* observer,
                        JobScheduler* scheduler,
                        ResourceMetadata* metadata,
                        FileCache* cache,
-                       ChangeListLoader* change_list_loader);
+                       LoaderController* loader_controller);
   ~EntryUpdatePerformer();
 
   // Requests the server to update the metadata of the entry specified by
   // |local_id| with the locally stored one.
   // Invokes |callback| when finished with the result of the operation.
   // |callback| must not be null.
   void UpdateEntry(const std::string& local_id,
                    const ClientContext& context,
                    const FileOperationCallback& callback);
 
   struct LocalState;
 
  private:
   // Part of UpdateEntry(). Called after local metadata look up.
   void UpdateEntryAfterPrepare(const ClientContext& context,
                                const FileOperationCallback& callback,
                                scoped_ptr<LocalState> local_state,
                                FileError error);
 
   // Part of UpdateEntry(). Called after UpdateResource is completed.
   void 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);
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   JobScheduler* scheduler_;
   ResourceMetadata* metadata_;
   FileCache* cache_;
-  ChangeListLoader* change_list_loader_;
+  LoaderController* loader_controller_;
   scoped_ptr<RemovePerformer> remove_performer_;
   scoped_ptr<EntryRevertPerformer> entry_revert_performer_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EntryUpdatePerformer> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(EntryUpdatePerformer);
 };
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_SYNC_ENTRY_UPDATE_PERFORMER_H_