Upstream android i18n change

BUG=
TEST=

Review URL: http://codereview.chromium.org/7741032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98638 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 5 deletions

diff --git a/base/i18n/number_formatting_unittest.cc b/base/i18n/number_formatting_unittest.cc
index e6a54b5..c7485d1 100644
--- a/base/i18n/number_formatting_unittest.cc
+++ b/base/i18n/number_formatting_unittest.cc
@@ -55,7 +55,10 @@ TEST(NumberFormattingTest, FormatDouble) {
     const char* expected_german;
   } cases[] = {
     {0.0, 0, "0", "0"},
+#if !defined(OS_ANDROID)
+    // Bionic can't printf negative zero correctly.
     {-0.0, 4, "-0.0000", "-0,0000"},
+#endif
     {1024.2, 0, "1,024", "1.024"},
     {-1024.223, 2, "-1,024.22", "-1.024,22"},
     {std::numeric_limits<double>::max(), 6,
diff --git a/base/i18n/rtl.cc b/base/i18n/rtl.cc
index 9684b1d..ba16c65 100644
--- a/base/i18n/rtl.cc
+++ b/base/i18n/rtl.cc
@@ -215,15 +215,15 @@ bool AdjustStringForLocaleDirection(string16* text) {
   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);
   }
 
@@ -258,7 +258,7 @@ void WrapStringWithLTRFormatting(string16* text) {
     return;
 
   // Inserting an LRE (Left-To-Right Embedding) mark as the first character.
-  text->insert(0, 1, kLeftToRightEmbeddingMark);
+  text->insert(0U, 1U, kLeftToRightEmbeddingMark);
 
   // Inserting a PDF (Pop Directional Formatting) mark as the last character.
   text->push_back(kPopDirectionalFormatting);
@@ -269,7 +269,7 @@ void WrapStringWithRTLFormatting(string16* text) {
     return;
 
   // Inserting an RLE (Right-To-Left Embedding) mark as the first character.
-  text->insert(0, 1, kRightToLeftEmbeddingMark);
+  text->insert(0U, 1U, kRightToLeftEmbeddingMark);
 
   // Inserting a PDF (Pop Directional Formatting) mark as the last character.
   text->push_back(kPopDirectionalFormatting);