2 files changed, 26 insertions, 3 deletions
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index 4755a94..9fbf35e 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -225,6 +225,21 @@ std::wstring GetDisplayStringInLTRDirectionality(std::wstring* text) {
   return *text;
 }
 
+const string16 StripWrappingBidiControlCharacters(const string16& text) {
+  if (text.empty())
+    return text;
+  size_t begin_index = 0;
+  char16 begin = text[begin_index];
+  if (begin == kLeftToRightEmbeddingMark ||
+      begin == kRightToLeftEmbeddingMark ||
+      begin == kLeftToRightOverride ||
+      begin == kRightToLeftOverride)
+    ++begin_index;
+  size_t end_index = text.length() - 1;
+  if (text[end_index] == kPopDirectionalFormatting)
+    --end_index;
+  return text.substr(begin_index, end_index - begin_index + 1);
+}
+
 }  // namespace i18n
 }  // namespace base
-
diff --git a/base/i18n/rtl.h b/base/i18n/rtl.h
index 70cd9d3..f708206 100644
--- a/base/i18n/rtl.h
+++ b/base/i18n/rtl.h
@@ -12,11 +12,13 @@ class FilePath;
 namespace base {
 namespace i18n {
 
-const char16 kRightToLeftMark = 0x200f;
-const char16 kLeftToRightMark = 0x200e;
+const char16 kRightToLeftMark = 0x200F;
+const char16 kLeftToRightMark = 0x200E;
 const char16 kLeftToRightEmbeddingMark = 0x202A;
 const char16 kRightToLeftEmbeddingMark = 0x202B;
 const char16 kPopDirectionalFormatting = 0x202C;
+const char16 kLeftToRightOverride = 0x202D;
+const char16 kRightToLeftOverride = 0x202E;
 
 enum TextDirection {
   UNKNOWN_DIRECTION,
@@ -108,6 +110,12 @@ void WrapPathWithLTRFormatting(const FilePath& path,
 // is returned.
 std::wstring GetDisplayStringInLTRDirectionality(std::wstring* text);
 
+// Strip the beginning (U+202A..U+202B, U+202D..U+202E) and/or ending (U+202C)
+// explicit bidi control characters from |text|, if there are any. Otherwise,
+// return the text itself. Explicit bidi control characters display and have
+// semantic effect. They can be deleted so they might not always appear in a
+// pair.
+const string16 StripWrappingBidiControlCharacters(const string16& text);
 }  // namespace i18n
 }  // namespace base