Check string and UI direction in GetDisplayStringInLTRDirectionality, etc.

base/i18n/rtl.cc

Index: base/i18n/rtl.cc
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index 29a2a88d555e6d2164b6f7acf23eba6631fc5890..cbbb63f646b1f5c354fd0392d77d7e194cf16e9c 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -319,11 +319,14 @@ void WrapPathWithLTRFormatting(const FilePath& path,
 }
 
 string16 GetDisplayStringInLTRDirectionality(const string16& text) {
-  if (!IsRTL())
-    return text;
-  string16 text_mutable(text);
-  WrapStringWithLTRFormatting(&text_mutable);
-  return text_mutable;
+  // Always wrap the string in RTL UI (it may be appended to RTL string).
+  // Also wrap strings with an RTL first strong character direction in LTR UI.
+  if (IsRTL() || GetFirstStrongCharacterDirection(text) == RIGHT_TO_LEFT) {
+    string16 text_mutable(text);
+    WrapStringWithLTRFormatting(&text_mutable);
+    return text_mutable;
+  }
+  return text;
 }
 
 string16 StripWrappingBidiControlCharacters(const string16& text) {