Revert 67191 - chrome_paths: refactor and sanitize cache directory handling...

chrome/common/chrome_paths_linux.cc

Index: chrome/common/chrome_paths_linux.cc
===================================================================
--- chrome/common/chrome_paths_linux.cc	(revision 67200)
+++ chrome/common/chrome_paths_linux.cc	(working copy)
@@ -6,7 +6,6 @@
 
 #include "base/environment.h"
 #include "base/file_util.h"
-#include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/nix/xdg_util.h"
 
@@ -29,32 +28,6 @@
   return true;
 }
 
-void 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 profile dir directly.
-
-  // Default value in cases where any of the following fails.
-  *result = profile_dir;
-
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-
-  FilePath cache_dir;
-  if (!PathService::Get(base::DIR_CACHE, &cache_dir))
-    return;
-  FilePath config_dir(
-      base::nix::GetXDGDirectory(env.get(), "XDG_CONFIG_HOME", ".config"));
-
-  if (!config_dir.AppendRelativePath(profile_dir, &cache_dir))
-    return;
-
-  *result = cache_dir;
-}
-
 bool GetChromeFrameUserDataDirectory(FilePath* result) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   FilePath config_dir(