Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: chrome/browser/chromeos/drive/file_system/operation_test_base.cc

Issue 150113002: drive: Also lock SearchOperation when locking ChangeListLoader (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/drive/file_system/operation_test_base.cc
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
index e4a691fd13d50d55d5cb1721da7021667943c7d4..146a49964fec0bb3e03f4b3d257f9b95219dd537 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -114,11 +114,13 @@ void OperationTestBase::SetUp() {
ASSERT_TRUE(success);
// Makes sure the FakeDriveService's content is loaded to the metadata_.
+ loader_controller_.reset(new internal::LoaderController);
change_list_loader_.reset(new internal::ChangeListLoader(
blocking_task_runner_.get(),
metadata_.get(),
scheduler_.get(),
- fake_drive_service_.get()));
+ fake_drive_service_.get(),
+ loader_controller_.get()));
change_list_loader_->LoadForTesting(
google_apis::test_util::CreateCopyResultCallback(&error));
test_util::RunBlockingPoolTask();

Powered by Google App Engine
This is Rietveld 408576698