| Index: content/renderer/render_view_browsertest.cc | 
| diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc | 
| index e3421a472f49714cdb5ef5edba4c8efecaa8eedd..bed5832f5040482d06f15ba1ad8573415e9e6590 100644 | 
| --- a/content/renderer/render_view_browsertest.cc | 
| +++ b/content/renderer/render_view_browsertest.cc | 
| @@ -1318,8 +1318,7 @@ TEST_F(RenderViewImplTest, ImeComposition) { | 
| case IME_CONFIRMCOMPOSITION: | 
| view()->OnImeConfirmComposition( | 
| base::WideToUTF16(ime_message->ime_string), | 
| -            gfx::Range::InvalidRange(), | 
| -            false); | 
| +            gfx::Range::InvalidRange(), false, 1); | 
| break; | 
|  | 
| case IME_CANCELCOMPOSITION: | 
| @@ -1575,8 +1574,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, 1); | 
|  | 
| // Non surrogate pair unicode character. | 
| const base::string16 unicode_composition = base::UTF8ToUTF16( | 
| @@ -1587,8 +1586,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, 1); | 
|  | 
| // Surrogate pair character. | 
| const base::string16 surrogate_pair_char = | 
| @@ -1602,8 +1601,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, 1); | 
|  | 
| // Mixed string. | 
| const base::string16 surrogate_pair_mixed_composition = | 
| @@ -1626,8 +1625,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, 1); | 
| } | 
| #endif | 
|  | 
|  |