Handle newCursorPosition correctly for Android's commitText()

third_party/WebKit/Source/core/editing/InputMethodControllerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/editing/InputMethodController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/dom/Range.h"
 #include "core/editing/Editor.h"
@@ skipping 177 matching lines @@
         insertHTMLElement("<input id='sample' type='password' size='24'>", "sample"));
 
     Vector<CompositionUnderline> underlines;
     underlines.append(CompositionUnderline(0, 5, Color(255, 0, 0), false, 0));
     controller().setComposition("foo", underlines, 0, 3);
     controller().confirmComposition();
 
     EXPECT_STREQ("foo", input->value().utf8().data());
 }
 
-TEST_F(InputMethodControllerTest, SetCompositionForInputWithDifferentNewCursorPositions)
+TEST_F(InputMethodControllerTest, SetCompositionForInputWithNewCursorPositions)
 {
     HTMLInputElement* input = toHTMLInputElement(
         insertHTMLElement("<input id='sample'>", "sample"));
 
     input->setValue("hello");
     controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
     EXPECT_STREQ("hello", input->value().utf8().data());
     EXPECT_EQ(2u, controller().getSelectionOffsets().start());
     EXPECT_EQ(2u, controller().getSelectionOffsets().end());
 
@@ skipping 36 matching lines @@
     EXPECT_EQ(7u, controller().getSelectionOffsets().end());
 
     // The cursor exceeds right boundary.
     // "heABllo*".
     controller().setComposition("AB", underlines, 100, 100);
     EXPECT_STREQ("heABllo", input->value().utf8().data());
     EXPECT_EQ(7u, controller().getSelectionOffsets().start());
     EXPECT_EQ(7u, controller().getSelectionOffsets().end());
 }
 
-TEST_F(InputMethodControllerTest, SetCompositionForContentEditableWithDifferentNewCursorPositions)
+TEST_F(InputMethodControllerTest, SetCompositionForContentEditableWithNewCursorPositions)
 {
     // There are 7 nodes and 5+1+5+1+3+4+3 characters: "hello", '\n', "world", "\n", "012", "3456", "789".
     Element* div = insertHTMLElement(
         "<div id='sample' contenteditable='true'>"
         "hello"
         "<div id='sample2' contenteditable='true'>world"
         "<p>012<b>3456</b><i>789</i></p>"
         "</div>"
         "</div>",
         "sample");
@@ skipping 132 matching lines @@
     EXPECT_EQ(1u, controller().getSelectionOffsets().start());
     EXPECT_EQ(1u, controller().getSelectionOffsets().end());
 }
 
 TEST_F(InputMethodControllerTest, InsertLineBreakAfterConfirmingText)
 {
     Element* div = insertHTMLElement(
         "<div id='sample' contenteditable='true'></div>",
         "sample");
 
-    controller().confirmCompositionOrInsertText("hello", InputMethodController::ConfirmCompositionBehavior::KeepSelection);
+    controller().commitComposition("hello");
     EXPECT_STREQ("hello", div->innerText().utf8().data());
 
     controller().setEditableSelectionOffsets(PlainTextRange(2, 2));
     EXPECT_EQ(2u, controller().getSelectionOffsets().start());
     EXPECT_EQ(2u, controller().getSelectionOffsets().end());
 
     frame().editor().insertLineBreak();
     EXPECT_STREQ("he\nllo", div->innerText().utf8().data());
     EXPECT_EQ(3u, controller().getSelectionOffsets().start());
     EXPECT_EQ(3u, controller().getSelectionOffsets().end());
@@ skipping 58 matching lines @@
     document().setTitle(emptyString());
     controller().setComposition("ni", underlines, 0, 1);
     EXPECT_STREQ("beforeinput.data:ni;input.data:ni;", document().title().utf8().data());
 
     document().setTitle(emptyString());
     controller().confirmComposition();
     EXPECT_STREQ("beforeinput.data:ni;input.data:ni;", document().title().utf8().data());
 }
 
 } // namespace blink