chrome_paths: refactor and sanitize cache directory handling

chrome/common/chrome_paths_linux.cc

 // Copyright (c) 2010 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/common/chrome_paths_internal.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "base/nix/xdg_util.h"
@@ skipping 10 matching lines @@
   FilePath config_dir(
       base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome");
 #else
   *result = config_dir.Append("chromium");
 #endif
   return true;
 }
 
+bool GetUserCacheDirectory(const FilePath& profile_dir, FilePath* result) {
+  // See http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  // for a spec on where cache files go.  Our rule is:
+  // - if the user-data-dir in the standard place,
+  //     use same subdirectory of the cache directory.
+  //     (this maps ~/.config/google-chrome to ~/.cache/google-chrome as well
+  //      as the same thing for ~/.config/chromium)
+  // - otherwise, use the user-data-dir directly.
+
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  FilePath cache_dir(
+      base::nix::GetXDGDirectory(env.get(), "XDG_CACHE_HOME", ".cache"));
+  FilePath config_dir(
+      base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
+
+  FilePath system_relative_dir = cache_dir;

[Mark Mentovai, 2010/11/18 16:55:57]

By the way, “why the copy?” applies here too.

+  if (config_dir.AppendRelativePath(profile_dir, &system_relative_dir)) {
+    *result = system_relative_dir;
+    return true;
+  }
+
+  *result = profile_dir;
+  return true;
+}
+
 bool GetChromeFrameUserDataDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   FilePath config_dir(
       base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
 #if defined(GOOGLE_CHROME_BUILD)
   *result = config_dir.Append("google-chrome-frame");
 #else
   *result = config_dir.Append("chrome-frame");
 #endif
   return true;
@@ skipping 26 matching lines @@
   return true;
 }
 
 bool GetUserDesktop(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   *result = base::nix::GetXDGUserDirectory(env.get(), "DESKTOP", "Desktop");
   return true;
 }
 
 }  // namespace chrome