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

chrome/browser/chromeos/drive/test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 // Disk space size used by FakeFreeDiskSpaceGetter.
 const int64 kLotsOfSpace = internal::kMinFreeSpace * 10;
 
 // This is a bitmask of cache states in FileCacheEntry. Used only in tests.
 enum TestFileCacheState {
   TEST_CACHE_STATE_NONE       = 0,
   TEST_CACHE_STATE_PINNED     = 1 << 0,
   TEST_CACHE_STATE_PRESENT    = 1 << 1,
   TEST_CACHE_STATE_DIRTY      = 1 << 2,
   TEST_CACHE_STATE_MOUNTED    = 1 << 3,
-  TEST_CACHE_STATE_PERSISTENT = 1 << 4,
 };
 
 // Test data type of file cache
 struct TestCacheResource {
   TestCacheResource(const std::string& source_file,
                     const std::string& resource_id,
                     const std::string& md5,
                     bool is_pinned,
                     bool is_dirty);
   ~TestCacheResource(){}
@@ skipping 49 matching lines @@
 // Adds test cache |resources| to |cache|. Returns whether the operation
 // succeeded or not.
 bool PrepareTestCacheResources(
     internal::FileCache* cache,
     const std::vector<TestCacheResource>& resources);
 
 }  // namespace test_util
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_