drive: DriveIntegrationService owns ResourceMetadataStorage

chrome/browser/chromeos/drive/file_system_unittest.cc

 // Copyright (c) 2012 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.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 81 matching lines @@
         fake_free_disk_space_getter_.get()));
 
     mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>);
 
     ASSERT_TRUE(cache_->Initialize());
 
     SetUpResourceMetadataAndFileSystem();
   }
 
   void SetUpResourceMetadataAndFileSystem() {
-    resource_metadata_.reset(new internal::ResourceMetadata(
+    metadata_storage_.reset(new internal::ResourceMetadataStorage(
         util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory),
         base::MessageLoopProxy::current()));
+    ASSERT_TRUE(metadata_storage_->Initialize());
+
+    resource_metadata_.reset(new internal::ResourceMetadata(
+        metadata_storage_.get(), base::MessageLoopProxy::current()));
 
     file_system_.reset(new FileSystem(
         profile_.get(),
         cache_.get(),
         fake_drive_service_.get(),
         scheduler_.get(),
         resource_metadata_.get(),
         base::MessageLoopProxy::current(),
         util::GetCacheRootPath(profile_.get()).Append(
             util::kTemporaryFileDirectory)));
@@ skipping 77 matching lines @@
 
   // Sets up a filesystem with directories: drive/root, drive/root/Dir1,
   // drive/root/Dir1/SubDir2 and files drive/root/File1, drive/root/Dir1/File2,
   // drive/root/Dir1/SubDir2/File3. If |use_up_to_date_timestamp| is true, sets
   // the changestamp to 654321, equal to that of "account_metadata.json" test
   // data, indicating the cache is holding the latest file system info.
   bool SetUpTestFileSystem(SetUpTestFileSystemParam param) {
     // Destroy the existing resource metadata to close DB.
     resource_metadata_.reset();
 
-    const std::string root_resource_id =
-        fake_drive_service_->GetRootResourceId();
+    base::FilePath metadata_directory =
+        util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory);
+    scoped_ptr<internal::ResourceMetadataStorage,
+               test_util::DestroyHelperForTests> metadata_storage(
+                   new internal::ResourceMetadataStorage(
+                       metadata_directory, base::MessageLoopProxy::current()));
+
     scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
         resource_metadata(new internal::ResourceMetadata(
-            util::GetCacheRootPath(profile_.get()).Append(
-                util::kMetadataDirectory),
-            base::MessageLoopProxy::current()));
+            metadata_storage_.get(), base::MessageLoopProxy::current()));
 
     if (resource_metadata->Initialize() != FILE_ERROR_OK)
       return false;
 
     const int64 changestamp = param == USE_SERVER_TIMESTAMP ? 654321 : 1;
     if (resource_metadata->SetLargestChangestamp(changestamp) != FILE_ERROR_OK)
       return false;
 
     // drive/root
+    const std::string root_resource_id =
+        fake_drive_service_->GetRootResourceId();
     if (resource_metadata->AddEntry(util::CreateMyDriveRootEntry(
             root_resource_id)) != FILE_ERROR_OK)
       return false;
 
     // drive/root/File1
     ResourceEntry file1;
     file1.set_title("File1");
     file1.set_resource_id("resource_id:File1");
     file1.set_parent_resource_id(root_resource_id);
     file1.mutable_file_specific_info()->set_md5("md5");
@@ skipping 44 matching lines @@
 
     // Recreate resource metadata.
     SetUpResourceMetadataAndFileSystem();
 
     return true;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
 
+  scoped_ptr<internal::ResourceMetadataStorage,
+             test_util::DestroyHelperForTests> metadata_storage_;
   scoped_ptr<internal::FileCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<FileSystem> file_system_;
   scoped_ptr<FakeDriveService> fake_drive_service_;
   scoped_ptr<JobScheduler> scheduler_;
   scoped_ptr<internal::ResourceMetadata, test_util::DestroyHelperForTests>
       resource_metadata_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
   scoped_ptr<StrictMock<MockDirectoryChangeObserver> > mock_directory_observer_;
 };
 
@@ skipping 534 matching lines @@
       file_path,
       google_apis::test_util::CreateCopyResultCallback(&error));
   google_apis::test_util::RunBlockingPoolTask();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Now able to remove the cache entry.
   EXPECT_EQ(FILE_ERROR_OK, cache_->Remove(entry->resource_id()));
 }
 
 }   // namespace drive