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

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2013 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/browser/chromeos/login/user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
+#include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
+#include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/worker_pool.h"
 #include "base/values.h"
@@ skipping 18 matching lines @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/session_length_limiter.h"
 #include "chrome/browser/managed_mode/chromeos/managed_user_password_service_factory.h"
 #include "chrome/browser/managed_mode/chromeos/manager_password_service_factory.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 1430 matching lines @@
   is_current_user_new_ = true;
   active_user_ = User::CreateRetailModeUser();
   GetUserImageManager(UserManager::kRetailModeUserName)->UserLoggedIn(
       is_current_user_new_,
       true);
   WallpaperManager::Get()->SetUserWallpaperNow(
       UserManager::kRetailModeUserName);
 }
 
 void UserManagerImpl::NotifyOnLogin() {
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  // Override user homedir.
+  if (GetLoggedInUsers().size() == 1) {
+    base::FilePath homedir = ProfileHelper::GetProfilePathByUserIdHash(
+        primary_user_->username_hash());
+    PathService::Override(base::DIR_HOME, homedir);

[Will Drewry, 2014/04/08 15:55:04]

Does this mean the home dir will always be the first user/primary user?  So
things like the RLZ check will only work if the "primary" account has it on,
etc? 

[Nikita (slow), 2014/04/08 16:40:08]

Correct. This is the way how it works today and has been discussed in more
details here
https://code.google.com/p/chromium/issues/detail?id=331530

+    PathService::Override(chrome::DIR_USER_DATA, homedir);
+  }
+
   UpdateNumberOfUsers();
-  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NotifyActiveUserHashChanged(active_user_->username_hash());
   NotifyActiveUserChanged(active_user_);
+  UpdateLoginState();
 
-  UpdateLoginState();
   // TODO(nkostylev): Deprecate this notification in favor of
   // ActiveUserChanged() observer call.
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::Source<UserManager>(this),
       content::Details<const User>(active_user_));
 
   // Owner must be first user in session. DeviceSettingsService can't deal with
   // multiple user and will mix up ownership, crbug.com/230018.
   if (GetLoggedInUsers().size() == 1) {
@@ skipping 526 matching lines @@
 }
 
 void UserManagerImpl::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace chromeos