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

chrome/browser/chromeos/drive/file_system_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_FILE_SYSTEM_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 12 matching lines @@
 
 namespace drive {
 
 class DriveAppRegistry;
 class DriveServiceInterface;
 class FileSystemInterface;
 class ResourceEntry;
 
 namespace util {
 
-// Path constants.
-
-// Name of the directory used to store metadata.
-const base::FilePath::CharType kMetadataDirectory[] = FILE_PATH_LITERAL("meta");
-
-// Name of the directory used to store cached files.
-const base::FilePath::CharType kCacheFileDirectory[] =
-    FILE_PATH_LITERAL("files");
-
-// Name of the directory used to store temporary files.
-const base::FilePath::CharType kTemporaryFileDirectory[] =
-    FILE_PATH_LITERAL("tmp");
-
 // Special resource IDs introduced to manage pseudo directory tree locally.
 // These strings are supposed to be different from any resource ID used on the
 // server, and are never sent to the server. Practical resource IDs used so far
 // have only alphabets/numbers ([a-zA-Z0-9]) and ':'.
 // Hence '<' and '>' around the directory name have been added to make them
 // different from normal server-side IDs.
 const char kDriveGrandRootSpecialResourceId[] = "<drive>";
 
 const char kDriveOtherDirSpecialResourceId[] = "<other>";
 
@@ skipping 95 matching lines @@
 std::string NormalizeFileName(const std::string& input);
 
 // Gets the cache root path (i.e. <user_profile_dir>/GCache/v1) from the
 // profile.
 base::FilePath GetCacheRootPath(Profile* profile);
 
 // Migrates cache files from old "persistent" and "tmp" directories to the new
 // "files" directory (see crbug.com/248905).
 // TODO(hashimoto): Remove this function at some point.
 void MigrateCacheFilesFromOldDirectories(
-    const base::FilePath& cache_root_directory);
+    const base::FilePath& cache_root_directory,
+    const base::FilePath::StringType& cache_file_directory_name);
 
 // Callback type for PrepareWritableFileAndRun.
 typedef base::Callback<void (FileError, const base::FilePath& path)>
     PrepareWritableFileCallback;
 
 // Invokes |callback| on blocking thread pool, after converting virtual |path|
 // string like "/special/drive/foo.txt" to the concrete local cache file path.
 // After |callback| returns, the written content is synchronized to the server.
 //
 // The |path| must be a path under Drive. Must be called from UI thread.
@@ skipping 49 matching lines @@
 // or an empty string if an error is found.
 std::string GetMd5Digest(const base::FilePath& file_path);
 
 // Returns true if Drive is enabled for the given Profile.
 bool IsDriveEnabledForProfile(Profile* profile);
 
 }  // namespace util
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_UTIL_H_