Revert "libchromeos-ui: drop LC_ALL env var setting"
This reverts commit 1e9c3dac5c903b32026f247e9af1b7fb8d66a069.
For now revert only on R55. For master discussion on crbug.com/649787.
BUG=chromium:117330
BUG=chromium:652326
BUG=chromium:649787
Change-Id: I38f752247add52de3d7c02d2ab2a7adf8ee850c3
Reviewed-on: https://chromium-review.googlesource.com/403834
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
diff --git a/libchromeos-ui/chromeos/ui/chromium_command_builder.cc b/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
index 8e349e8..0855ad4 100644
--- a/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
+++ b/libchromeos-ui/chromeos/ui/chromium_command_builder.cc
@@ -157,6 +157,7 @@
AddEnvVar("LOGNAME", kUser);
AddEnvVar("SHELL", "/bin/sh");
AddEnvVar("PATH", "/bin:/usr/bin");
+ AddEnvVar("LC_ALL", "en_US.utf8");
AddEnvVar("XDG_RUNTIME_DIR", "/run/chrome");
const base::FilePath data_dir(GetPath("/home").Append(kUser));
diff --git a/libchromeos-ui/chromeos/ui/chromium_command_builder_unittest.cc b/libchromeos-ui/chromeos/ui/chromium_command_builder_unittest.cc
index b0f62d5..42adbce 100644
--- a/libchromeos-ui/chromeos/ui/chromium_command_builder_unittest.cc
+++ b/libchromeos-ui/chromeos/ui/chromium_command_builder_unittest.cc
@@ -159,6 +159,7 @@
EXPECT_EQ("chronos", ReadEnvVar("LOGNAME"));
EXPECT_EQ("/bin/sh", ReadEnvVar("SHELL"));
EXPECT_FALSE(ReadEnvVar("PATH").empty());
+ EXPECT_EQ("en_US.utf8", ReadEnvVar("LC_ALL"));
base::FilePath data_dir(util::GetReparentedPath("/home/chronos", base_path_));
EXPECT_EQ(data_dir.value(), ReadEnvVar("DATA_DIR"));
EXPECT_TRUE(base::DirectoryExists(data_dir));
