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

content/ppapi_plugin/ppapi_plugin_main.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/base_paths.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
+#include "base/files/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop/message_loop.h"
+#include "base/path_service.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/sandbox_linux/sandbox_linux.h"
 #include "content/ppapi_plugin/ppapi_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/plugin/content_plugin_client.h"
@@ skipping 75 matching lines @@
     std::replace(locale.begin(), locale.end(), '-', '_');
     locale.append(".UTF-8");
     setlocale(LC_ALL, locale.c_str());
     setenv("LANG", locale.c_str(), 0);
 #endif
   }
 
 #if defined(OS_CHROMEOS)
   // Specifies $HOME explicitly because some plugins rely on $HOME but
   // no other part of Chrome OS uses that.  See crbug.com/335290.
-  setenv("HOME", base::GetHomeDir().value().c_str(), 1);
+  base::FilePath homedir;
+  if (command_line.HasSwitch(switches::kHomedir)) {
+    homedir =
+        base::FilePath(command_line.GetSwitchValueASCII(switches::kHomedir));
+  } else {
+    PathService::Get(base::DIR_HOME, &homedir);
+  }
+  setenv("HOME", homedir.value().c_str(), 1);
 #endif
 
   base::MessageLoop main_message_loop;
   base::PlatformThread::SetName("CrPPAPIMain");
   base::debug::TraceLog::GetInstance()->SetProcessName("PPAPI Process");
   base::debug::TraceLog::GetInstance()->SetProcessSortIndex(
       kTraceEventPpapiProcessSortIndex);
 
 #if defined(OS_LINUX) && defined(USE_NSS)
   // Some out-of-process PPAPI plugins use NSS.
@@ skipping 16 matching lines @@
 
 #if defined(OS_WIN)
   SkTypeface_SetEnsureLOGFONTAccessibleProc(SkiaPreCacheFont);
 #endif
 
   main_message_loop.Run();
   return 0;
 }
 
 }  // namespace content