drive: Use ResourceMetadataStorage from FileCache

chrome/browser/chromeos/drive/file_system_unittest.cc

Index: chrome/browser/chromeos/drive/file_system_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc
index 727ec417a35b35766cef15fae90ed1d97e8ae3fa..4c56a7d53fc5f9e5b9d167e11baa72acf4089924 100644
--- a/chrome/browser/chromeos/drive/file_system_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system_unittest.cc
@@ -84,17 +84,8 @@ class FileSystemTest : public testing::Test {
     ASSERT_TRUE(file_util::CreateDirectory(util::GetCacheRootPath(
         profile_.get()).Append(util::kTemporaryFileDirectory)));
 
-    cache_.reset(new internal::FileCache(
-        util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory),
-        util::GetCacheRootPath(profile_.get()).Append(
-            util::kCacheFileDirectory),
-        base::MessageLoopProxy::current(),
-        fake_free_disk_space_getter_.get()));
-
     mock_directory_observer_.reset(new StrictMock<MockDirectoryChangeObserver>);
 
-    ASSERT_TRUE(cache_->Initialize());
-
     SetUpResourceMetadataAndFileSystem();
   }
 
@@ -104,6 +95,14 @@ class FileSystemTest : public testing::Test {
         base::MessageLoopProxy::current()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
+    cache_.reset(new internal::FileCache(
+        metadata_storage_.get(),
+        util::GetCacheRootPath(profile_.get()).Append(
+            util::kCacheFileDirectory),
+        base::MessageLoopProxy::current(),
+        fake_free_disk_space_getter_.get()));
+    ASSERT_TRUE(cache_->Initialize());
+
     resource_metadata_.reset(new internal::ResourceMetadata(
         metadata_storage_.get(), base::MessageLoopProxy::current()));