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

chrome/app/chrome_main_delegate.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/app/chrome_main_delegate.h"
 
+#include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/process/memory.h"
@@ skipping 452 matching lines @@
 
     diagnostics::DiagnosticsWriter writer(format);
     *exit_code = diagnostics::DiagnosticsController::GetInstance()->Run(
         command_line, &writer);
     diagnostics::DiagnosticsController::GetInstance()->ClearResults();
     return true;
   }
 #endif
 
 #if defined(OS_CHROMEOS)
+  // Initialize primary user homedir (in multi-profile session) as it may be
+  // passed as a command line switch.
+  base::FilePath homedir;
+  if (command_line.HasSwitch(chromeos::switches::kHomedir)) {
+    homedir = base::FilePath(
+        command_line.GetSwitchValueASCII(chromeos::switches::kHomedir));
+    PathService::OverrideAndCreateIfNeeded(
+        base::DIR_HOME, homedir, true, false);
+  }
+
   // If we are recovering from a crash on ChromeOS, then we will do some
   // recovery using the diagnostics module, and then continue on. We fake up a
   // command line to tell it that we want it to recover, and to preserve the
   // original command line.
   if (command_line.HasSwitch(chromeos::switches::kLoginUser) ||
       command_line.HasSwitch(switches::kDiagnosticsRecovery)) {
 
     // The statistics subsystem needs get initialized soon enough for the
     // statistics to be collected.  It's safe to call this more than once.
     base::StatisticsRecorder::Initialize();
@@ skipping 420 matching lines @@
 }
 
 content::ContentUtilityClient*
 ChromeMainDelegate::CreateContentUtilityClient() {
 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return g_chrome_content_utility_client.Pointer();
 #endif
 }