Use file_util::GetHomeDir instead of getenv("HOME").

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/2919005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52272 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 10 deletions

diff --git a/base/mime_util_xdg.cc b/base/mime_util_xdg.cc
index 3f6227e..d00a568 100644
--- a/base/mime_util_xdg.cc
+++ b/base/mime_util_xdg.cc
@@ -396,8 +396,8 @@ void AddXDGDataDir(const FilePath& dir) {
 // Add all the xdg icon directories.
 void InitIconDir() {
   Singleton<MimeUtilConstants>::get()->icon_dirs_->clear();
-  const char* home = getenv("HOME");
-  if (home) {
+  FilePath home = file_util::GetHomeDir();
+  if (!home.empty()) {
       FilePath legacy_data_dir(home);
       legacy_data_dir = legacy_data_dir.AppendASCII(".icons");
       if (file_util::DirectoryExists(legacy_data_dir))
@@ -406,7 +406,7 @@ void InitIconDir() {
   const char* env = getenv("XDG_DATA_HOME");
   if (env) {
     AddXDGDataDir(FilePath(env));
-  } else if (home) {
+  } else if (!home.empty()) {
     FilePath local_data_dir(home);
     local_data_dir = local_data_dir.AppendASCII(".local");
     local_data_dir = local_data_dir.AppendASCII("share");
diff --git a/base/nss_util.cc b/base/nss_util.cc
index 927f1ab..14c27af 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -34,16 +34,16 @@ namespace {
 
 #if !defined(USE_NSS_FOR_SSL_ONLY)
 std::string GetDefaultConfigDirectory() {
-  const char* home = getenv("HOME");
-  if (home == NULL) {
+  FilePath home = file_util::GetHomeDir();
+  if (home.empty()) {
     LOG(ERROR) << "$HOME is not set.";
-    return "";
+    return std::string();
   }
   FilePath dir(home);
   dir = dir.AppendASCII(".pki").AppendASCII("nssdb");
   if (!file_util::CreateDirectory(dir)) {
     LOG(ERROR) << "Failed to create ~/.pki/nssdb directory.";
-    return "";
+    return std::string();
   }
   return dir.value();
 }
diff --git a/chrome/browser/importer/firefox_importer_utils_linux.cc b/chrome/browser/importer/firefox_importer_utils_linux.cc
index cb815dc..eeefd38 100644
--- a/chrome/browser/importer/firefox_importer_utils_linux.cc
+++ b/chrome/browser/importer/firefox_importer_utils_linux.cc
@@ -10,9 +10,9 @@ FilePath GetProfilesINI() {
   FilePath ini_file;
   // The default location of the profile folder containing user data is
   // under user HOME directory in .mozilla/firefox folder on Linux.
-  const char *home = getenv("HOME");
-  if (home && home[0]) {
-    ini_file = FilePath(home).Append(".mozilla/firefox/profiles.ini");
+  FilePath home = file_util::GetHomeDir();
+  if (!home.empty()) {
+    ini_file = home.Append(".mozilla/firefox/profiles.ini");
   }
   if (file_util::PathExists(ini_file))
     return ini_file;