drive: Also lock SearchOperation when locking ChangeListLoader

chrome/browser/chromeos/drive/change_list_loader_unittest.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/change_list_loader.h"
 
 #include "base/callback_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/testing_pref_service.h"
@@ skipping 82 matching lines @@
     metadata_.reset(new ResourceMetadata(
         metadata_storage_.get(), base::MessageLoopProxy::current().get()));
     ASSERT_EQ(FILE_ERROR_OK, metadata_->Initialize());
 
     cache_.reset(new FileCache(metadata_storage_.get(),
                                temp_dir_.path(),
                                base::MessageLoopProxy::current().get(),
                                NULL /* free_disk_space_getter */));
     ASSERT_TRUE(cache_->Initialize());
 
+    loader_controller_.reset(new LoaderController);
     change_list_loader_.reset(
         new ChangeListLoader(base::MessageLoopProxy::current().get(),
                              metadata_.get(),
                              scheduler_.get(),
-                             drive_service_.get()));
+                             drive_service_.get(),
+                             loader_controller_.get()));
   }
 
   // Adds a new file to the root directory of the service.
   scoped_ptr<google_apis::ResourceEntry> AddNewFile(const std::string& title) {
     google_apis::GDataErrorCode error = google_apis::GDATA_FILE_ERROR;
     scoped_ptr<google_apis::ResourceEntry> entry;
     drive_service_->AddNewFile(
         "text/plain",
         "content text",
         drive_service_->GetRootResourceId(),
         title,
         false,  // shared_with_me
         google_apis::test_util::CreateCopyResultCallback(&error, &entry));
     base::RunLoop().RunUntilIdle();
     EXPECT_EQ(google_apis::HTTP_CREATED, error);
     return entry.Pass();
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<TestingPrefServiceSimple> pref_service_;
   scoped_ptr<FakeDriveService> drive_service_;
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
   scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
   scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
+  scoped_ptr<LoaderController> loader_controller_;
   scoped_ptr<ChangeListLoader> change_list_loader_;
 };
 
 TEST_F(ChangeListLoaderTest, Load) {
   EXPECT_FALSE(change_list_loader_->IsRefreshing());
 
   // Start initial load.
   TestChangeListLoaderObserver observer(change_list_loader_.get());
 
   EXPECT_EQ(0, drive_service_->about_resource_load_count());
@@ skipping 41 matching lines @@
   change_list_loader_->LoadForTesting(
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Reset loader.
   change_list_loader_.reset(
       new ChangeListLoader(base::MessageLoopProxy::current().get(),
                            metadata_.get(),
                            scheduler_.get(),
-                           drive_service_.get()));
+                           drive_service_.get(),
+                           loader_controller_.get()));
 
   // Add a file to the service.
   scoped_ptr<google_apis::ResourceEntry> gdata_entry = AddNewFile("New File");
   ASSERT_TRUE(gdata_entry);
 
   // Start loading. Because local metadata is available, the load results in
   // returning FILE_ERROR_OK without fetching full list of resources.
   const int previous_resource_list_load_count =
       drive_service_->resource_list_load_count();
   TestChangeListLoaderObserver observer(change_list_loader_.get());
@@ skipping 226 matching lines @@
   change_list_loader_->LoadForTesting(
       google_apis::test_util::CreateCopyResultCallback(&error));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Add a new file.
   scoped_ptr<google_apis::ResourceEntry> file = AddNewFile("New File");
   ASSERT_TRUE(file);
 
   // Lock the loader.
-  scoped_ptr<base::ScopedClosureRunner> lock = change_list_loader_->GetLock();
+  scoped_ptr<base::ScopedClosureRunner> lock = loader_controller_->GetLock();
 
   // Start update.
   TestChangeListLoaderObserver observer(change_list_loader_.get());
   FileError check_for_updates_error = FILE_ERROR_FAILED;
   change_list_loader_->CheckForUpdates(
       google_apis::test_util::CreateCopyResultCallback(
           &check_for_updates_error));
   base::RunLoop().RunUntilIdle();
 
   // Update is pending due to the lock.
   EXPECT_TRUE(observer.changed_directories().empty());
 
   // Unlock the loader, this should resume the pending udpate.
   lock.reset();
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1U, observer.changed_directories().count(
       util::GetDriveMyDriveRootPath()));
 }
 
 }  // namespace internal
 }  // namespace drive