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

trunk/src/chrome/common/chrome_paths_linux.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/common/chrome_paths_internal.h"
 
-#include "base/base_paths.h"
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/nix/xdg_util.h"
 #include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
 
 namespace chrome {
 
 using base::nix::GetXDGDirectory;
 using base::nix::GetXDGUserDirectory;
 using base::nix::kDotConfigDir;
 using base::nix::kXdgConfigHomeEnvVar;
 
 namespace {
 
 const char kDownloadsDir[] = "Downloads";
 const char kMusicDir[] = "Music";
 const char kPicturesDir[] = "Pictures";
 const char kVideosDir[] = "Videos";
 
 // Generic function for GetUser{Music,Pictures,Video}Directory.
 bool GetUserMediaDirectory(const std::string& xdg_name,
                            const std::string& fallback_name,
                            base::FilePath* result) {
 #if defined(OS_CHROMEOS)
   // No local media directories on CrOS.
   return false;
 #else
   *result = GetXDGUserDirectory(xdg_name.c_str(), fallback_name.c_str());
 
-  base::FilePath home;
-  PathService::Get(base::DIR_HOME, &home);
+  base::FilePath home = base::GetHomeDir();
   if (*result != home) {
     base::FilePath desktop;
     if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop))
       return false;
     if (*result != desktop) {
       return true;
     }
   }
 
   *result = home.Append(fallback_name);
@@ skipping 48 matching lines @@
 
   *result = cache_dir;
 }
 
 bool GetUserDocumentsDirectory(base::FilePath* result) {
   *result = GetXDGUserDirectory("DOCUMENTS", "Documents");
   return true;
 }
 
 bool GetUserDownloadsDirectorySafe(base::FilePath* result) {
-  base::FilePath home;
-  PathService::Get(base::DIR_HOME, &home);
+  base::FilePath home = base::GetHomeDir();
   *result = home.Append(kDownloadsDir);
   return true;
 }
 
 bool GetUserDownloadsDirectory(base::FilePath* result) {
   *result = GetXDGUserDirectory("DOWNLOAD", kDownloadsDir);
   return true;
 }
 
 // We respect the user's preferred pictures location, unless it is
@@ skipping 15 matching lines @@
 }
 
 bool ProcessNeedsProfileDir(const std::string& process_type) {
   // For now we have no reason to forbid this on Linux as we don't
   // have the roaming profile troubles there. Moreover the Linux breakpad needs
   // profile dir access in all process if enabled on Linux.
   return true;
 }
 
 }  // namespace chrome