Merge Chromium src@r53293

Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34

1 files changed, 16 insertions, 1 deletions

diff --git a/base/sys_string_conversions_linux.cc b/base/sys_string_conversions_linux.cc
index 4c4f5ed..6a6eac9 100644
--- a/base/sys_string_conversions_linux.cc
+++ b/base/sys_string_conversions_linux.cc
@@ -7,7 +7,7 @@
 #include <wchar.h>
 
 #include "base/string_piece.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 namespace base {
 
@@ -24,6 +24,19 @@ std::wstring SysUTF8ToWide(const StringPiece& utf8) {
   return out;
 }
 
+#if defined(OS_CHROMEOS)
+
+// ChromeOS always runs in UTF-8 locale.
+std::string SysWideToNativeMB(const std::wstring& wide) {
+  return WideToUTF8(wide);
+}
+
+std::wstring SysNativeMBToWide(const StringPiece& native_mb) {
+  return SysUTF8ToWide(native_mb);
+}
+
+#else
+
 std::string SysWideToNativeMB(const std::wstring& wide) {
   mbstate_t ps;
 
@@ -141,4 +154,6 @@ std::wstring SysNativeMBToWide(const StringPiece& native_mb) {
   return out;
 }
 
+#endif  // OS_CHROMEOS
+
 }  // namespace base