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

chrome/browser/chromeos/drive/test_util.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/test_util.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 24 matching lines @@
                       "md5_tmp_alphanumeric",
                       false,
                       false),
     // Cache resource in tmp dir, i.e. not pinned or dirty, with resource_id
     // containing non-alphanumeric characters.
     TestCacheResource("cache2.png",
                       "tmp:`~!@#$%^&*()-_=+[{|]}\\;',<.>/?",
                       "md5_tmp_non_alphanumeric",
                       false,
                       false),
-    // Cache resource that is pinned and persistent.
+    // Cache resource that is pinned and present.
     TestCacheResource("pinned/cache.mp3",
                       "pinned:existing",
                       "md5_pinned_existing",
                       true,
                       false),
     // Cache resource with a non-existent source file that is pinned.
     TestCacheResource("",
                       "pinned:non-existent",
                       "md5_pinned_non_existent",
                       true,
@@ skipping 15 matching lines @@
       resources,
       resources + ARRAYSIZE_UNSAFE(resources));
 }
 
 FileCacheEntry ToCacheEntry(int cache_state) {
   FileCacheEntry cache_entry;
   cache_entry.set_is_present(cache_state & TEST_CACHE_STATE_PRESENT);
   cache_entry.set_is_pinned(cache_state & TEST_CACHE_STATE_PINNED);
   cache_entry.set_is_dirty(cache_state & TEST_CACHE_STATE_DIRTY);
   cache_entry.set_is_mounted(cache_state & TEST_CACHE_STATE_MOUNTED);
-  cache_entry.set_is_persistent(cache_state & TEST_CACHE_STATE_PERSISTENT);
   return cache_entry;
 }
 
 bool CacheStatesEqual(const FileCacheEntry& a, const FileCacheEntry& b) {
-  return (a.is_present() == b.is_present() &&
-          a.is_pinned() == b.is_pinned() &&
-          a.is_dirty() == b.is_dirty() &&
-          a.is_mounted() == b.is_mounted() &&
-          a.is_persistent() == b.is_persistent());
+  return a.is_present() == b.is_present() &&
+      a.is_pinned() == b.is_pinned() &&
+      a.is_dirty() == b.is_dirty() &&
+      a.is_mounted() == b.is_mounted();
 }
 
 bool PrepareTestCacheResources(
     internal::FileCache* cache,
     const std::vector<TestCacheResource>& resources) {
   // cache->StoreOnUIThread requires real file to be stored. As a dummy data for
   // testing, an empty temporary file is created.
   base::ScopedTempDir temp_dir;
   if (!temp_dir.CreateUniqueTempDir())
     return false;
@@ skipping 36 matching lines @@
       google_apis::test_util::RunBlockingPoolTask();
       if (error != FILE_ERROR_OK)
         return false;
     }
   }
   return true;
 }
 
 }  // namespace test_util
 }  // namespace drive