drive: Merge 'persistent' and 'tmp' directories to 'files'

chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc

Index: chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc b/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
index 758d549d4914dc8cdf0d3d8d81369301bfec172a..4f80668718a4b5cd32518c073ba149874478142c 100644
--- a/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_cache_metadata_unittest.cc
@@ -47,7 +47,6 @@ TEST_F(FileCacheMetadataTest, CacheTest) {
     FileCacheEntry new_cache_entry;
     new_cache_entry.set_md5(test_md5);
     new_cache_entry.set_is_present(true);
-    new_cache_entry.set_is_persistent(true);
     metadata_->AddOrUpdateCacheEntry(test_resource_id, new_cache_entry);
   }
 
@@ -56,7 +55,6 @@ TEST_F(FileCacheMetadataTest, CacheTest) {
   ASSERT_TRUE(metadata_->GetCacheEntry(test_resource_id, &cache_entry));
   EXPECT_EQ(test_md5, cache_entry.md5());
   EXPECT_TRUE(cache_entry.is_present());
-  EXPECT_TRUE(cache_entry.is_persistent());
 
   // resource_id doesn't exist.
   EXPECT_FALSE(metadata_->GetCacheEntry("not_found_resource_id", &cache_entry));