drive: Also lock SearchOperation when locking ChangeListLoader

chrome/browser/chromeos/drive/file_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 19 matching lines @@
 namespace drive {
 
 class DriveServiceInterface;
 class FileCacheEntry;
 class FileSystemObserver;
 class JobScheduler;
 
 namespace internal {
 class ChangeListLoader;
 class FileCache;
+class LoaderController;
 class ResourceMetadata;
 class SyncClient;
 }  // namespace internal
 
 namespace file_system {
 class CopyOperation;
 class CreateDirectoryOperation;
 class CreateFileOperation;
 class DownloadOperation;
 class GetFileForSavingOperation;
@@ skipping 198 matching lines @@
   DriveServiceInterface* drive_service_;
   JobScheduler* scheduler_;
   internal::ResourceMetadata* resource_metadata_;
 
   // Time of the last update check.
   base::Time last_update_check_time_;
 
   // Error of the last update check.
   FileError last_update_check_error_;
 
+  // Used to control ChangeListLoader.
+  scoped_ptr<internal::LoaderController> loader_controller_;
+
   // The loader is used to load the change lists.
   scoped_ptr<internal::ChangeListLoader> change_list_loader_;
 
   scoped_ptr<internal::SyncClient> sync_client_;
 
   ObserverList<FileSystemObserver> observers_;
 
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
 
   base::FilePath temporary_file_directory_;
@@ skipping 15 matching lines @@
   // 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<FileSystem> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_H_