| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 6ecd9f21b4ac11fbcd975da41f613538fbfb7135..2f881bd4ae4b539dd870c388b30799fdaaa7c447 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -1254,6 +1254,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;
|
|
|
| @@ -1515,7 +1516,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(
|
| @@ -1526,7 +1529,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 =
|
| @@ -1540,7 +1544,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 =
|
| @@ -1563,7 +1568,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
|
|
|
|
|