Move all callers of GetHomeDir() to PathService::Get(base::DIR_HOME).

base/file_util_posix.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/file_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
@@ skipping 13 matching lines @@
 #if defined(OS_MACOSX)
 #include <AvailabilityMacros.h>
 #include "base/mac/foundation_util.h"
 #elif !defined(OS_CHROMEOS) && defined(USE_GLIB)
 #include <glib.h>  // for g_get_home_dir()
 #endif
 
 #include <fstream>
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 140 matching lines @@
     if (mapping != MAP_FAILED) {
       if (mprotect(mapping, pagesize, PROT_READ | PROT_EXEC) == 0)
         result = true;
       munmap(mapping, pagesize);
     }
   }
   return result;
 }
 #endif  // defined(OS_LINUX)
 
+#if defined(OS_CHROMEOS)
+// On Chrome OS Indicates that a user has logged in and that
+// GetHomeDir() calls are now valid.
+static bool is_user_logged_in = false;
+
+// Primary logged in user id hash which is used on ChromeOS to identify
+// that user home dir.
+static std::string primary_user_id_hash;
+
+bool IsUserLoggedIn() {
+  return is_user_logged_in;
+}
+#endif
+
 }  // namespace
 
 FilePath MakeAbsoluteFilePath(const FilePath& input) {
   ThreadRestrictions::AssertIOAllowed();
   char full_path[PATH_MAX];
   if (realpath(input.value().c_str(), full_path) == NULL)
     return FilePath();
   return FilePath(full_path);
 }
 
@@ skipping 273 matching lines @@
     return true;
   }
 #endif
   return GetTempDir(path);
 }
 #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
 #if !defined(OS_MACOSX)  // Mac implementation is in file_util_mac.mm.
 FilePath GetHomeDir() {
 #if defined(OS_CHROMEOS)
-  if (SysInfo::IsRunningOnChromeOS())
-    return FilePath("/home/chronos/user");
+  if (SysInfo::IsRunningOnChromeOS()) {
+    if (IsUserLoggedIn()) {
+      return FilePath("/home/chronos/u-" + primary_user_id_hash);
+    } else {
+      NOTREACHED() << "Called GetHomeDir() when not logged in.";
+      return FilePath("/home/chronos/user");
+    }
+  }
 #endif
 
   const char* home_dir = getenv("HOME");
   if (home_dir && home_dir[0])
     return FilePath(home_dir);
 
 #if defined(OS_ANDROID)
   DLOG(WARNING) << "OS_ANDROID: Home directory lookup not yet implemented.";
 #elif defined(USE_GLIB) && !defined(OS_CHROMEOS)
   // g_get_home_dir calls getpwent, which can fall through to LDAP calls so
   // this may do I/O. However, it should be rare that $HOME is not defined and
   // this is typically called from the path service which has no threading
   // restrictions. The path service will cache the result which limits the
   // badness of blocking on I/O. As a result, we don't have a thread
   // restriction here.
   home_dir = g_get_home_dir();
   if (home_dir && home_dir[0])
     return FilePath(home_dir);
 #endif
 
   FilePath rv;
   if (GetTempDir(&rv))
     return rv;
 
   // Last resort.
   return FilePath("/tmp");
 }
 #endif  // !defined(OS_MACOSX)
 
+#if defined(OS_CHROMEOS)
+void SetUserLoggedIn(bool logged_in) {
+  is_user_logged_in = logged_in;
+}
+
+void SetPrimaryUserIdHash(std::string user_id_hash) {
+  primary_user_id_hash = user_id_hash;
+}
+#endif
+
 bool CreateTemporaryFile(FilePath* path) {
   ThreadRestrictions::AssertIOAllowed();  // For call to close().
   FilePath directory;
   if (!GetTempDir(&directory))
     return false;
   int fd = CreateAndOpenFdForTemporaryFile(directory, path);
   if (fd < 0)
     return false;
   close(fd);
   return true;
@@ skipping 393 matching lines @@
     result = false;
   if (IGNORE_EINTR(close(outfile)) < 0)
     result = false;
 
   return result;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace internal
 }  // namespace base