Support parsing BackgroundSpans and UnderlineSpans in Android IME's commitText()

content/renderer/render_view_browsertest.cc

Index: content/renderer/render_view_browsertest.cc
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index 88d711e70f38ca15a54d33fa8e2bf033cd27423f..03aaef1ebdb3bbcc5753cf6a122a3aaecaf0618b 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -1256,6 +1256,7 @@ TEST_F(RenderViewImplTest, ImeComposition) {
 
       case IME_COMMITTEXT:
         view()->OnImeCommitText(base::WideToUTF16(ime_message->ime_string),
+                                std::vector<blink::WebCompositionUnderline>(),
                                 gfx::Range::InvalidRange(), 0);
         break;
 
@@ -1516,7 +1517,9 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
 
   for (size_t i = 0; i < bounds.size(); ++i)
     EXPECT_LT(0, bounds[i].width());
-  view()->OnImeCommitText(empty_string, gfx::Range::InvalidRange(), 0);
+  view()->OnImeCommitText(empty_string,
+                          std::vector<blink::WebCompositionUnderline>(),
+                          gfx::Range::InvalidRange(), 0);
 
   // Non surrogate pair unicode character.
   const base::string16 unicode_composition = base::UTF8ToUTF16(
@@ -1527,7 +1530,8 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
   ASSERT_EQ(unicode_composition.size(), bounds.size());
   for (size_t i = 0; i < bounds.size(); ++i)
     EXPECT_LT(0, bounds[i].width());
-  view()->OnImeCommitText(empty_string, gfx::Range::InvalidRange(), 0);
+  view()->OnImeCommitText(empty_string, empty_underline,
+                          gfx::Range::InvalidRange(), 0);
 
   // Surrogate pair character.
   const base::string16 surrogate_pair_char =
@@ -1541,7 +1545,8 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
   ASSERT_EQ(surrogate_pair_char.size(), bounds.size());
   EXPECT_LT(0, bounds[0].width());
   EXPECT_EQ(0, bounds[1].width());
-  view()->OnImeCommitText(empty_string, gfx::Range::InvalidRange(), 0);
+  view()->OnImeCommitText(empty_string, empty_underline,
+                          gfx::Range::InvalidRange(), 0);
 
   // Mixed string.
   const base::string16 surrogate_pair_mixed_composition =
@@ -1564,7 +1569,8 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
       EXPECT_LT(0, bounds[i].width());
     }
   }
-  view()->OnImeCommitText(empty_string, gfx::Range::InvalidRange(), 0);
+  view()->OnImeCommitText(empty_string, empty_underline,
+                          gfx::Range::InvalidRange(), 0);
 }
 #endif