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

Unified Diff: chrome/browser/chromeos/drive/sync_client_unittest.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
« no previous file with comments | « chrome/browser/chromeos/drive/sync_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/sync_client_unittest.cc
diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc
index 4698b96da9b5c283524eafcb8dd7d471f5ba0331..fcfbfe882c3e320d2a2cae5ea3ea011ca11374d6 100644
--- a/chrome/browser/chromeos/drive/sync_client_unittest.cc
+++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc
@@ -135,11 +135,13 @@ class SyncClientTest : public testing::Test {
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()));
ASSERT_NO_FATAL_FAILURE(SetUpTestData());
sync_client_.reset(new SyncClient(base::MessageLoopProxy::current().get(),
@@ -147,7 +149,7 @@ class SyncClientTest : public testing::Test {
scheduler_.get(),
metadata_.get(),
cache_.get(),
- change_list_loader_.get(),
+ loader_controller_.get(),
temp_dir_.path()));
// Disable delaying so that DoSyncLoop() starts immediately.
@@ -257,6 +259,7 @@ class SyncClientTest : public testing::Test {
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_;
scoped_ptr<SyncClient> sync_client_;
« no previous file with comments | « chrome/browser/chromeos/drive/sync_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698