Upstream android i18n change

base/i18n/rtl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/i18n/rtl.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 197 matching lines @@
   // box so there is no issue with displaying zero-width bidi control characters
   // on any system.  Thus no need for the !IsRTL() check here.
   if (text->empty())
     return false;
 
   bool ui_direction_is_rtl = IsRTL();
 
   bool has_rtl_chars = StringContainsStrongRTLChars(*text);
   if (!ui_direction_is_rtl && has_rtl_chars) {
     WrapStringWithRTLFormatting(text);
-    text->insert(0, 1, kLeftToRightMark);
+    text->insert(0U, 1U, kLeftToRightMark);
     text->push_back(kLeftToRightMark);
   } else if (ui_direction_is_rtl && has_rtl_chars) {
     WrapStringWithRTLFormatting(text);
-    text->insert(0, 1, kRightToLeftMark);
+    text->insert(0U, 1U, kRightToLeftMark);
     text->push_back(kRightToLeftMark);
   } else if (ui_direction_is_rtl) {
     WrapStringWithLTRFormatting(text);
-    text->insert(0, 1, kRightToLeftMark);
+    text->insert(0U, 1U, kRightToLeftMark);
     text->push_back(kRightToLeftMark);
   }
 
   return true;
 }
 
 #endif  // !OS_WIN
 
 bool StringContainsStrongRTLChars(const string16& text) {
   const UChar* string = text.c_str();
@@ skipping 14 matching lines @@
   }
 
   return false;
 }
 
 void WrapStringWithLTRFormatting(string16* text) {
   if (text->empty())
     return;
 
   // Inserting an LRE (Left-To-Right Embedding) mark as the first character.
-  text->insert(0, 1, kLeftToRightEmbeddingMark);
+  text->insert(static_cast<std::wstring::size_type>(0), 1,

[brettw, 2011/08/26 19:28:52]

Why use static_cast here and 0U above? I'd use 0u here as well.

[michaelbai, 2011/08/26 22:01:50]

Right, Done

+               kLeftToRightEmbeddingMark);
 
   // Inserting a PDF (Pop Directional Formatting) mark as the last character.
   text->push_back(kPopDirectionalFormatting);
 }
 
 void WrapStringWithRTLFormatting(string16* text) {
   if (text->empty())
     return;
 
   // Inserting an RLE (Right-To-Left Embedding) mark as the first character.
-  text->insert(0, 1, kRightToLeftEmbeddingMark);
+  text->insert(static_cast<std::wstring::size_type>(0), 1,
+               kRightToLeftEmbeddingMark);
 
   // Inserting a PDF (Pop Directional Formatting) mark as the last character.
   text->push_back(kPopDirectionalFormatting);
 }
 
 void WrapPathWithLTRFormatting(const FilePath& path,
                                string16* rtl_safe_path) {
   // Wrap the overall path with LRE-PDF pair which essentialy marks the
   // string as a Left-To-Right string.
   // Inserting an LRE (Left-To-Right Embedding) mark as the first character.
@@ skipping 29 matching lines @@
       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