drive: Use ResourceMetadataStorage from FileCache

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 66 matching lines @@
     scheduler_.reset(new JobScheduler(profile_.get(),
                                       fake_drive_service_.get()));
 
     ASSERT_TRUE(file_util::CreateDirectory(util::GetCacheRootPath(
         profile_.get()).Append(util::kMetadataDirectory)));
     ASSERT_TRUE(file_util::CreateDirectory(util::GetCacheRootPath(
         profile_.get()).Append(util::kCacheFileDirectory)));
     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();
   }
 
   void SetUpResourceMetadataAndFileSystem() {
     metadata_storage_.reset(new internal::ResourceMetadataStorage(
         util::GetCacheRootPath(profile_.get()).Append(util::kMetadataDirectory),
         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()));
 
     file_system_.reset(new FileSystem(
         profile_.get(),
         cache_.get(),
         fake_drive_service_.get(),
         scheduler_.get(),
         resource_metadata_.get(),
         base::MessageLoopProxy::current(),
@@ skipping 720 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