Move out Drive cache file path constants outside of file_system_util.h.

chrome/browser/chromeos/drive/file_cache_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_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
@@ skipping 44 matching lines @@
 // pool and tests the interaction among threads.
 // TODO(hashimoto): remove this class. crbug.com/231221.
 class FileCacheTestOnUIThread : public testing::Test {
  protected:
   FileCacheTestOnUIThread() : expected_error_(FILE_ERROR_OK),
                               expected_cache_state_(0) {
   }
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    ASSERT_TRUE(file_util::CreateDirectory(
-        temp_dir_.path().Append(util::kMetadataDirectory)));
-    ASSERT_TRUE(file_util::CreateDirectory(
-        temp_dir_.path().Append(util::kCacheFileDirectory)));
+    const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta");
+    const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files");
+
+    ASSERT_TRUE(file_util::CreateDirectory(metadata_dir));
+    ASSERT_TRUE(file_util::CreateDirectory(cache_dir));
 
     ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(),
                                                     &dummy_file_path_));
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     scoped_refptr<base::SequencedWorkerPool> pool =
         content::BrowserThread::GetBlockingPool();
     blocking_task_runner_ =
         pool->GetSequencedTaskRunner(pool->GetSequenceToken());
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path(), blocking_task_runner_.get()));
+        metadata_dir,
+        blocking_task_runner_.get()));
 
     bool success = false;
     base::PostTaskAndReplyWithResult(
         blocking_task_runner_.get(),
         FROM_HERE,
         base::Bind(&ResourceMetadataStorage::Initialize,
                    base::Unretained(metadata_storage_.get())),
         google_apis::test_util::CreateCopyResultCallback(&success));
     test_util::RunBlockingPoolTask();
     ASSERT_TRUE(success);
 
     cache_.reset(new FileCache(
         metadata_storage_.get(),
-        temp_dir_.path().Append(util::kCacheFileDirectory),
+        cache_dir,
         blocking_task_runner_.get(),
         fake_free_disk_space_getter_.get()));
 
     success = false;
     base::PostTaskAndReplyWithResult(
         blocking_task_runner_.get(),
         FROM_HERE,
         base::Bind(&FileCache::Initialize, base::Unretained(cache_.get())),
         google_apis::test_util::CreateCopyResultCallback(&success));
     test_util::RunBlockingPoolTask();
@@ skipping 686 matching lines @@
   // Store the file with a modified content and md5. It should stay pinned.
   TestStoreToCache(id, md5_modified, dummy_file_path_, FILE_ERROR_OK,
                    TEST_CACHE_STATE_PRESENT | TEST_CACHE_STATE_PINNED);
 }
 
 // Tests FileCache methods working with the blocking task runner.
 class FileCacheTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    ASSERT_TRUE(file_util::CreateDirectory(
-        temp_dir_.path().Append(util::kMetadataDirectory)));
-    ASSERT_TRUE(file_util::CreateDirectory(
-        temp_dir_.path().Append(util::kCacheFileDirectory)));
+    const base::FilePath metadata_dir = temp_dir_.path().AppendASCII("meta");
+    const base::FilePath cache_dir = temp_dir_.path().AppendASCII("files");
+
+    ASSERT_TRUE(file_util::CreateDirectory(metadata_dir));
+    ASSERT_TRUE(file_util::CreateDirectory(cache_dir));
 
     fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
 
     metadata_storage_.reset(new ResourceMetadataStorage(
-        temp_dir_.path().Append(util::kMetadataDirectory),
+        metadata_dir,
         base::MessageLoopProxy::current().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
 
     cache_.reset(new FileCache(
         metadata_storage_.get(),
-        temp_dir_.path().Append(util::kCacheFileDirectory),
+        cache_dir,
         base::MessageLoopProxy::current().get(),
         fake_free_disk_space_getter_.get()));
     ASSERT_TRUE(cache_->Initialize());
   }
 
   static void RenameCacheFilesToNewFormat(FileCache* cache) {
     cache->RenameCacheFilesToNewFormat();
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
 
   scoped_ptr<ResourceMetadataStorage, test_util::DestroyHelperForTests>
       metadata_storage_;
   scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
 };
 
 TEST_F(FileCacheTest, ScanCacheFile) {
   // Set up files in the cache directory.
-  const base::FilePath file_directory =
-      temp_dir_.path().Append(util::kCacheFileDirectory);
+  const base::FilePath file_directory = temp_dir_.path().AppendASCII("files");
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(
       file_directory.AppendASCII("id_foo"), "foo"));
 
   // Remove the existing DB.
   const base::FilePath metadata_directory =
-      temp_dir_.path().Append(util::kMetadataDirectory);
+      temp_dir_.path().AppendASCII("meta");
   ASSERT_TRUE(base::DeleteFile(metadata_directory, true /* recursive */));
 
   // Create a new cache and initialize it.
   metadata_storage_.reset(new ResourceMetadataStorage(
       metadata_directory, base::MessageLoopProxy::current().get()));
   ASSERT_TRUE(metadata_storage_->Initialize());
 
   cache_.reset(new FileCache(metadata_storage_.get(),
-                             temp_dir_.path().Append(util::kCacheFileDirectory),
+                             file_directory,
                              base::MessageLoopProxy::current().get(),
                              fake_free_disk_space_getter_.get()));
   ASSERT_TRUE(cache_->Initialize());
 
   // Check contents of the cache.
   FileCacheEntry cache_entry;
   EXPECT_TRUE(cache_->GetCacheEntry("id_foo", &cache_entry));
   EXPECT_TRUE(cache_entry.is_present());
   EXPECT_EQ(base::MD5String("foo"), cache_entry.md5());
 }
@@ skipping 32 matching lines @@
 
   EXPECT_TRUE(cache_->GetCacheEntry(id_pinned, &entry));
   EXPECT_TRUE(base::PathExists(pinned_path));
 
   // Returns false when disk space cannot be freed.
   fake_free_disk_space_getter_->set_default_value(0);
   EXPECT_FALSE(cache_->FreeDiskSpaceIfNeededFor(kNeededBytes));
 }
 
 TEST_F(FileCacheTest, RenameCacheFilesToNewFormat) {
-  const base::FilePath file_directory =
-      temp_dir_.path().Append(util::kCacheFileDirectory);
+  const base::FilePath file_directory = temp_dir_.path().AppendASCII("files");
 
   // File with an old style "<ID>.<MD5>" name.
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(
       file_directory.AppendASCII("id_koo.md5"), "koo"));
 
   // File with multiple extensions should be removed.
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(
       file_directory.AppendASCII("id_kyu.md5.mounted"), "kyu (mounted)"));
   ASSERT_TRUE(google_apis::test_util::WriteStringToFile(
       file_directory.AppendASCII("id_kyu.md5"), "kyu"));
@@ skipping 18 matching lines @@
                                           &contents));
   EXPECT_EQ("koo", contents);
   contents.clear();
   EXPECT_TRUE(base::ReadFileToString(file_directory.AppendASCII("id_kyu"),
                                           &contents));
   EXPECT_EQ("kyu", contents);
 }
 
 }  // namespace internal
 }  // namespace drive