drive: DriveIntegrationService owns ResourceMetadataStorage

chrome/browser/chromeos/drive/file_system/operation_test_base.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/file_system/operation_test_base.h"
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
@@ skipping 42 matching lines @@
 
   fake_drive_service_.reset(new FakeDriveService);
   fake_drive_service_->LoadResourceListForWapi(
       "chromeos/gdata/root_feed.json");
   fake_drive_service_->LoadAccountMetadataForWapi(
       "chromeos/gdata/account_metadata.json");
 
   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;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_,
       FROM_HERE,
       base::Bind(&internal::ResourceMetadata::Initialize,
                  base::Unretained(metadata_.get())),
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
   ASSERT_EQ(FILE_ERROR_OK, error);
 
   fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
   cache_.reset(new internal::FileCache(temp_dir_.path(),
                                        temp_dir_.path(),
                                        blocking_task_runner_.get(),
                                        fake_free_disk_space_getter_.get()));
-  bool success = false;

[kinaba, 2013/06/21 06:41:18]

It cannot be a declaration but still it might be better to keep it as an
assignment: success = false;

[hashimoto, 2013/06/21 07:03:17]

Done.

   base::PostTaskAndReplyWithResult(
       blocking_task_runner_,
       FROM_HERE,
       base::Bind(&internal::FileCache::Initialize,
                  base::Unretained(cache_.get())),
       google_apis::test_util::CreateCopyResultCallback(&success));
   google_apis::test_util::RunBlockingPoolTask();
   ASSERT_TRUE(success);
 
   // Makes sure the FakeDriveService's content is loaded to the metadata_.
@@ skipping 26 matching lines @@
       FROM_HERE,
       base::Bind(&internal::ResourceMetadata::GetResourceEntryByPath,
                  base::Unretained(metadata()), path, entry),
       base::Bind(google_apis::test_util::CreateCopyResultCallback(&error)));
   google_apis::test_util::RunBlockingPoolTask();
   return error;
 }
 
 }  // namespace file_system
 }  // namespace drive