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

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

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.h
diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
index e47c85dead75634de21c201ba9ab30ea0822d52b..ae7550d56c7e2d27fe38cc51fabde378ee95ec79 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h
@@ -30,6 +30,7 @@ class JobScheduler;
namespace internal {
class ChangeListLoader;
class FileCache;
+class LoaderController;
class ResourceMetadata;
class ResourceMetadataStorage;
} // namespace internal
@@ -117,6 +118,9 @@ class OperationTestBase : public testing::Test {
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();
}
@@ -136,6 +140,7 @@ class OperationTestBase : public testing::Test {
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_;
};
« no previous file with comments | « chrome/browser/chromeos/drive/file_system.cc ('k') | chrome/browser/chromeos/drive/file_system/operation_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698