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

* Fixes GetHomeDir() for multi-profiles case on Chrome OS.
* Once user signs in on Chrome OS base::DIR_HOME is overridden with primary user homedir.
* Added content switch --homedir to pass that information to ppapi plugins since they run in a separate process and previous base::DIR_HOME override does not apply there.

This fix doesn't require checking for --multi-profiles switch
since user_id hash is known even without it.

BUG=331530
TBR=vitalybuka@chromium.org

Review URL: https://codereview.chromium.org/200473002

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

1 files changed, 8 insertions, 2 deletions

diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
index 0cd87af..c54a194 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
@@ -4,11 +4,13 @@
 
 #include "rlz/chromeos/lib/rlz_value_store_chromeos.h"
 
+#include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/files/important_file_writer.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
+#include "base/path_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
@@ -42,15 +44,19 @@ base::FilePath g_testing_rlz_store_path_;
 
 // Returns file path of the RLZ storage.
 base::FilePath GetRlzStorePath() {
+  base::FilePath homedir;
+  PathService::Get(base::DIR_HOME, &homedir);
   return g_testing_rlz_store_path_.empty() ?
-      base::GetHomeDir().Append(kRLZDataFileName) :
+      homedir.Append(kRLZDataFileName) :
       g_testing_rlz_store_path_.Append(kRLZDataFileName);
 }
 
 // Returns file path of the RLZ storage lock file.
 base::FilePath GetRlzStoreLockPath() {
+  base::FilePath homedir;
+  PathService::Get(base::DIR_HOME, &homedir);
   return g_testing_rlz_store_path_.empty() ?
-      base::GetHomeDir().Append(kRLZLockFileName) :
+      homedir.Append(kRLZLockFileName) :
       g_testing_rlz_store_path_.Append(kRLZLockFileName);
 }