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

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

Issue 17004011: drive: DriveIntegrationService owns ResourceMetadataStorage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a nit Created 7 years, 6 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 8f312457aede5c076827144410b56d75355e6344..eaed57229e7be7fa3f9ac57d8349d54237c21345 100644
--- a/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
+++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.cc
@@ -60,7 +60,19 @@ void OperationTestBase::SetUp() {
scheduler_.reset(
new JobScheduler(profile_.get(), fake_drive_service_.get()));
- metadata_.reset(new internal::ResourceMetadata(temp_dir_.path(),
+ metadata_storage_.reset(new internal::ResourceMetadataStorage(
+ temp_dir_.path(), blocking_task_runner_));
+ bool success = false;
+ base::PostTaskAndReplyWithResult(
+ blocking_task_runner_,
+ FROM_HERE,
+ base::Bind(&internal::ResourceMetadataStorage::Initialize,
+ base::Unretained(metadata_storage_.get())),
+ google_apis::test_util::CreateCopyResultCallback(&success));
+ google_apis::test_util::RunBlockingPoolTask();
+ ASSERT_TRUE(success);
+
+ metadata_.reset(new internal::ResourceMetadata(metadata_storage_.get(),
blocking_task_runner_));
FileError error = FILE_ERROR_FAILED;
@@ -78,7 +90,7 @@ void OperationTestBase::SetUp() {
temp_dir_.path(),
blocking_task_runner_.get(),
fake_free_disk_space_getter_.get()));
- bool success = false;
+ success = false;
base::PostTaskAndReplyWithResult(
blocking_task_runner_,
FROM_HERE,
« no previous file with comments | « chrome/browser/chromeos/drive/file_system/operation_test_base.h ('k') | chrome/browser/chromeos/drive/file_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698