Revert 270872 "Move all callers of GetHomeDir() to PathService::..."

trunk/src/base/nix/xdg_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 "base/nix/xdg_util.h"
 
 #include <string>
 
-#include "base/base_paths.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/path_service.h"
 #include "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.h"
 
 namespace {
 
 // The KDE session version environment variable used in KDE 4.
 const char kKDE4SessionEnvVar[] = "KDE_SESSION_VERSION";
 
 }  // namespace
 
 namespace base {
 namespace nix {
 
 const char kDotConfigDir[] = ".config";
 const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
 
 FilePath GetXDGDirectory(Environment* env, const char* env_name,
                          const char* fallback_dir) {
   FilePath path;
   std::string env_value;
-  if (env->GetVar(env_name, &env_value) && !env_value.empty()) {
+  if (env->GetVar(env_name, &env_value) && !env_value.empty())
     path = FilePath(env_value);
-  } else {
-    PathService::Get(base::DIR_HOME, &path);
-    path = path.Append(fallback_dir);
-  }
+  else
+    path = GetHomeDir().Append(fallback_dir);
   return path.StripTrailingSeparators();
 }
 
 FilePath GetXDGUserDirectory(const char* dir_name, const char* fallback_dir) {
   FilePath path;
   char* xdg_dir = xdg_user_dir_lookup(dir_name);
   if (xdg_dir) {
     path = FilePath(xdg_dir);
     free(xdg_dir);
   } else {
-    PathService::Get(base::DIR_HOME, &path);
-    path = path.Append(fallback_dir);
+    path = GetHomeDir().Append(fallback_dir);
   }
   return path.StripTrailingSeparators();
 }
 
 DesktopEnvironment GetDesktopEnvironment(Environment* env) {
   // XDG_CURRENT_DESKTOP is the newest standard circa 2012.
   std::string xdg_current_desktop;
   if (env->GetVar("XDG_CURRENT_DESKTOP", &xdg_current_desktop)) {
     // Not all desktop environments set this env var as of this writing.
     if (xdg_current_desktop == "Unity")
@@ skipping 50 matching lines @@
   }
   return NULL;
 }
 
 const char* GetDesktopEnvironmentName(Environment* env) {
   return GetDesktopEnvironmentName(GetDesktopEnvironment(env));
 }
 
 }  // namespace nix
 }  // namespace base