Handle newCursorPosition correctly for Android's commitText()

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <tuple>
@@ skipping 1213 matching lines @@
   ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
                              ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON,
                              0);
   view_->OnMouseEvent(&mouse_event);
 
   EXPECT_FALSE(view_->has_composition_text_);
 
   EXPECT_EQ(2U, sink_->message_count());
 
   if (sink_->message_count() == 2) {
-    // Verify mouse event happens after the confirm-composition event.
-    EXPECT_EQ(InputMsg_ImeConfirmComposition::ID,
+    // Verify mouse event happens after the commit-text event.
+    EXPECT_EQ(InputMsg_ImeFinishComposingText::ID,
               sink_->GetMessageAt(0)->type());
     EXPECT_EQ(InputMsg_HandleInputEvent::ID,
               sink_->GetMessageAt(1)->type());
   }
 }
 
 // Checks that touch-event state is maintained correctly.
 TEST_F(RenderWidgetHostViewAuraTest, TouchEventState) {
   view_->InitAsChild(nullptr);
   view_->Show();
@@ skipping 3102 matching lines @@
 
 // This test is for ui::TextInputClient::ConfirmCompositionText.
 TEST_F(InputMethodResultAuraTest, ConfirmCompositionText) {
   base::Closure ime_call =
       base::Bind(&ui::TextInputClient::ConfirmCompositionText,
                  base::Unretained(text_input_client()));
   for (auto index : active_view_sequence_) {
     ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
     SetHasCompositionTextToTrue();
     EXPECT_TRUE(!!RunAndReturnIPCSent(ime_call, processes_[index],
-                                      InputMsg_ImeConfirmComposition::ID));
+                                      InputMsg_ImeFinishComposingText::ID));
   }
 }
 
-// This test is for ui::TextInputClient::ConfirmCompositionText.
+// This test is for ui::TextInputClient::ClearCompositionText.
 TEST_F(InputMethodResultAuraTest, ClearCompositionText) {
   base::Closure ime_call =
       base::Bind(&ui::TextInputClient::ClearCompositionText,
                  base::Unretained(text_input_client()));
   for (auto index : active_view_sequence_) {
     ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
     SetHasCompositionTextToTrue();
     EXPECT_TRUE(!!RunAndReturnIPCSent(ime_call, processes_[index],
                                       InputMsg_ImeSetComposition::ID));
   }
 }
 
 // This test is for that ui::TextInputClient::InsertText.
 TEST_F(InputMethodResultAuraTest, InsertText) {
   base::Closure ime_call =
       base::Bind(&ui::TextInputClient::InsertText,
                  base::Unretained(text_input_client()), base::string16());
   for (auto index : active_view_sequence_) {
     ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
     EXPECT_TRUE(!!RunAndReturnIPCSent(ime_call, processes_[index],
-                                      InputMsg_ImeConfirmComposition::ID));
+                                      InputMsg_ImeCommitText::ID));
   }
 }
 
 // This test is for RenderWidgetHostViewAura::FinishImeCompositionSession which
 // is in response to a mouse click during an ongoing composition.
 TEST_F(InputMethodResultAuraTest, FinishImeCompositionSession) {
   base::Closure ime_finish_session_call =
       base::Bind(&RenderWidgetHostViewAura::FinishImeCompositionSession,
                  base::Unretained(tab_view()));
   for (auto index : active_view_sequence_) {
     ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
     SetHasCompositionTextToTrue();
     EXPECT_TRUE(!!RunAndReturnIPCSent(ime_finish_session_call,
                                       processes_[index],
-                                      InputMsg_ImeConfirmComposition::ID));
+                                      InputMsg_ImeFinishComposingText::ID));
   }
 }
 
 // This test is for ui::TextInputClient::ChangeTextDirectionAndLayoutAlignment.
 TEST_F(InputMethodResultAuraTest, ChangeTextDirectionAndLayoutAlignment) {
   base::Closure ime_finish_session_call = base::Bind(
       base::IgnoreResult(
           &RenderWidgetHostViewAura::ChangeTextDirectionAndLayoutAlignment),
       base::Unretained(tab_view()), base::i18n::LEFT_TO_RIGHT);
   for (auto index : active_view_sequence_) {
@@ skipping 165 matching lines @@
 
     // Retrieve the selected text from clipboard and verify it is as expected.
     base::string16 result_text;
     clipboard->ReadText(ui::CLIPBOARD_TYPE_SELECTION, &result_text);
     EXPECT_EQ(expected_text, result_text);
   }
 }
 #endif
 
 }  // namespace content