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

chrome/browser/chromeos/drive/file_cache.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_FILE_CACHE_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_CACHE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 53 matching lines @@
 // FileCache is used to maintain cache states of FileSystem.
 //
 // All non-static public member functions, unless mentioned otherwise (see
 // GetCacheFilePath() for example), should be run with |blocking_task_runner|.
 class FileCache {
  public:
   // Enum defining GCache subdirectory location.
   // This indexes into |FileCache::cache_paths_| vector.
   enum CacheSubDirectoryType {
     CACHE_TYPE_META = 0,       // Resource metadata.
-    CACHE_TYPE_PERSISTENT,     // Files that are pinned or modified locally,
-                               // not evictable, hopefully.
-    CACHE_TYPE_TMP,            // Files that don't meet criteria to be in
-                               // persistent dir, and hence evictable.
+    CACHE_TYPE_FILES,          // Cached files.
     CACHE_TYPE_TMP_DOWNLOADS,  // Downloaded files.
     CACHE_TYPE_TMP_DOCUMENTS,  // Temporary JSON files for hosted documents.
     NUM_CACHE_TYPES,           // This must be at the end.
   };
 
   // Enum defining type of file operation e.g. copy or move, etc.
   enum FileOperationType {
     FILE_OPERATION_MOVE = 0,
     FILE_OPERATION_COPY,
   };
@@ skipping 184 matching lines @@
   static std::vector<base::FilePath> GetCachePaths(
       const base::FilePath& cache_root_path);
 
   // Creates cache directory and its sub-directories if they don't exist.
   // TODO(glotov): take care of this when the setup and cleanup part is
   // landed, noting that these directories need to be created for development
   // in linux box and unittest. (http://crosbug.com/27577)
   static bool CreateCacheDirectories(
       const std::vector<base::FilePath>& paths_to_create);
 
-  // Returns the type of the sub directory where the cache file is stored.
-  static CacheSubDirectoryType GetSubDirectoryType(
-      const FileCacheEntry& cache_entry);
-
  private:
   friend class FileCacheTest;
   friend class FileCacheTestOnUIThread;
 
   // Enum defining origin of a cached file.
   enum CachedFileOrigin {
     CACHED_FILE_FROM_SERVER = 0,
     CACHED_FILE_LOCALLY_MODIFIED,
     CACHED_FILE_MOUNTED,
   };
 
   ~FileCache();
 
   // Returns absolute path of the file if it were cached or to be cached.
   //
   // Can be called on any thread.
   base::FilePath GetCacheFilePath(const std::string& resource_id,
                                   const std::string& md5,
-                                  CacheSubDirectoryType sub_dir_type,
                                   CachedFileOrigin file_origin) const;
 
 
   // Checks whether the current thread is on the right sequenced worker pool
   // with the right sequence ID. If not, DCHECK will fail.
   void AssertOnSequencedWorkerPool();
 
   // Initializes the cache. Returns true on success.
   bool InitializeOnBlockingPool();
 
   // Destroys the cache on the blocking pool.
   void DestroyOnBlockingPool();
 
+  // Migrates files from old "persistent" and "tmp" directories to the new
+  // "files" directory (see crbug.com/248905).
+  // TODO(hashimoto): Remove this method at some point.
+  void MigrateFilesFromOldDirectories();
+
   // Used to implement Store and StoreLocallyModifiedOnUIThread.
   // TODO(hidehiko): Merge this method with Store(), after
   // StoreLocallyModifiedOnUIThread is removed.
   FileError StoreInternal(const std::string& resource_id,
                           const std::string& md5,
                           const base::FilePath& source_path,
                           FileOperationType file_operation_type);
 
   // Used to implement MarkAsMountedOnUIThread.
   FileError MarkAsMounted(const std::string& resource_id,
@@ skipping 32 matching lines @@
 // this value.
 //
 // Copied from cryptohome/homedirs.h.
 // TODO(satorux): Share the constant.
 const int64 kMinFreeSpace = 512 * 1LL << 20;
 
 }  // namespace internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_CACHE_H_