| Index: content/renderer/render_view_browsertest.cc
|
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
|
| index 6a23b252abdd2f99829fc05b14b181ae2b0f8aaf..8efc20970627bdd29f18741d06a194193d4e577a 100644
|
| --- a/content/renderer/render_view_browsertest.cc
|
| +++ b/content/renderer/render_view_browsertest.cc
|
| @@ -1336,8 +1336,7 @@ TEST_F(RenderViewImplTest, ImeComposition) {
|
| case IME_CONFIRMCOMPOSITION:
|
| view()->OnImeConfirmComposition(
|
| base::WideToUTF16(ime_message->ime_string),
|
| - gfx::Range::InvalidRange(),
|
| - false);
|
| + gfx::Range::InvalidRange(), false, 0);
|
| break;
|
|
|
| case IME_CANCELCOMPOSITION:
|
| @@ -1593,8 +1592,8 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
|
|
| for (size_t i = 0; i < bounds.size(); ++i)
|
| EXPECT_LT(0, bounds[i].width());
|
| - view()->OnImeConfirmComposition(
|
| - empty_string, gfx::Range::InvalidRange(), false);
|
| + view()->OnImeConfirmComposition(empty_string, gfx::Range::InvalidRange(),
|
| + false, 0);
|
|
|
| // Non surrogate pair unicode character.
|
| const base::string16 unicode_composition = base::UTF8ToUTF16(
|
| @@ -1605,8 +1604,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()->OnImeConfirmComposition(
|
| - empty_string, gfx::Range::InvalidRange(), false);
|
| + view()->OnImeConfirmComposition(empty_string, gfx::Range::InvalidRange(),
|
| + false, 0);
|
|
|
| // Surrogate pair character.
|
| const base::string16 surrogate_pair_char =
|
| @@ -1620,8 +1619,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()->OnImeConfirmComposition(
|
| - empty_string, gfx::Range::InvalidRange(), false);
|
| + view()->OnImeConfirmComposition(empty_string, gfx::Range::InvalidRange(),
|
| + false, 0);
|
|
|
| // Mixed string.
|
| const base::string16 surrogate_pair_mixed_composition =
|
| @@ -1644,8 +1643,8 @@ TEST_F(RenderViewImplTest, GetCompositionCharacterBoundsTest) {
|
| EXPECT_LT(0, bounds[i].width());
|
| }
|
| }
|
| - view()->OnImeConfirmComposition(
|
| - empty_string, gfx::Range::InvalidRange(), false);
|
| + view()->OnImeConfirmComposition(empty_string, gfx::Range::InvalidRange(),
|
| + false, 0);
|
| }
|
| #endif
|
|
|
|
|