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

chrome/browser/chromeos/drive/file_system_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/file_system_util.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 305 matching lines @@
   DCHECK(IsStringUTF8(input));
 
   std::string output;
   if (!base::ConvertToUtf8AndNormalize(input, base::kCodepageUTF8, &output))
     output = input;
   ReplaceChars(output, kSlash, std::string(kEscapedSlash), &output);
   return output;
 }
 
 void MigrateCacheFilesFromOldDirectories(
-    const base::FilePath& cache_root_directory) {
+    const base::FilePath& cache_root_directory,
+    const base::FilePath::StringType& cache_file_directory_name) {
   const base::FilePath persistent_directory =
       cache_root_directory.AppendASCII("persistent");
   const base::FilePath tmp_directory =
       cache_root_directory.AppendASCII("tmp");
   if (!base::PathExists(persistent_directory))
     return;
 
   const base::FilePath cache_file_directory =
-      cache_root_directory.Append(kCacheFileDirectory);
+      cache_root_directory.Append(cache_file_directory_name);
 
   // Move all files inside "persistent" to "files".
   MoveAllFilesFromDirectory(persistent_directory, cache_file_directory);
   base::DeleteFile(persistent_directory,  true /* recursive */);
 
   // Move all files inside "tmp" to "files".
   MoveAllFilesFromDirectory(tmp_directory, cache_file_directory);
 }
 
 void PrepareWritableFileAndRun(Profile* profile,
@@ skipping 106 matching lines @@
   // Disable Drive if preference is set. This can happen with commandline flag
   // --disable-drive or enterprise policy, or with user settings.
   if (profile->GetPrefs()->GetBoolean(prefs::kDisableDrive))
     return false;
 
   return true;
 }
 
 }  // namespace util
 }  // namespace drive