drive: Also lock SearchOperation when locking ChangeListLoader

chrome/browser/chromeos/drive/file_system/operation_test_base.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_FILE_SYSTEM_OPERATION_TEST_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_
 
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
@@ skipping 12 matching lines @@
 
 namespace drive {
 
 class FakeDriveService;
 class FakeFreeDiskSpaceGetter;
 class JobScheduler;
 
 namespace internal {
 class ChangeListLoader;
 class FileCache;
+class LoaderController;
 class ResourceMetadata;
 class ResourceMetadataStorage;
 }  // namespace internal
 
 namespace file_system {
 
 // Base fixture class for testing Drive file system operations. It sets up the
 // basic set of Drive internal classes (ResourceMetadata, Cache, etc) on top of
 // FakeDriveService for testing.
 class OperationTestBase : public testing::Test {
@@ skipping 67 matching lines @@
   LoggingObserver* observer() { return &observer_; }
   JobScheduler* scheduler() { return scheduler_.get(); }
   base::SequencedTaskRunner* blocking_task_runner() {
     return blocking_task_runner_.get();
   }
   internal::ResourceMetadata* metadata() { return metadata_.get(); }
   FakeFreeDiskSpaceGetter* fake_free_disk_space_getter() {
     return fake_free_disk_space_getter_.get();
   }
   internal::FileCache* cache() { return cache_.get(); }
+  internal::LoaderController* loader_controller() {
+    return loader_controller_.get();
+  }
   internal::ChangeListLoader* change_list_loader() {
     return change_list_loader_.get();
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
   base::ScopedTempDir temp_dir_;
 
   LoggingObserver observer_;
   scoped_ptr<FakeDriveService> fake_drive_service_;
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<internal::ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
   scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
       metadata_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
   scoped_ptr<internal::FileCache, test_util::DestroyHelperForTests> cache_;
+  scoped_ptr<internal::LoaderController> loader_controller_;
   scoped_ptr<internal::ChangeListLoader> change_list_loader_;
 };
 
 }  // namespace file_system
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_OPERATION_TEST_BASE_H_