Handle newCursorPosition correctly for Android's commitText()

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 1fd39b62337e6c881635ccc1726ee61875a02299..dcfef1ba765ada142dd4ac74fff834b1d8e07eda 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1365,8 +1365,7 @@ void RenderWidgetHostViewAura::SetCompositionText(
 void RenderWidgetHostViewAura::ConfirmCompositionText() {
   if (text_input_manager_ && text_input_manager_->GetActiveWidget() &&
       has_composition_text_) {
-    text_input_manager_->GetActiveWidget()->ImeConfirmComposition(
-        base::string16(), gfx::Range::InvalidRange(), false);
+    text_input_manager_->GetActiveWidget()->ImeFinishComposingText(false);
   }
   has_composition_text_ = false;
 }
@@ -1382,8 +1381,11 @@ void RenderWidgetHostViewAura::InsertText(const base::string16& text) {
   DCHECK_NE(GetTextInputType(), ui::TEXT_INPUT_TYPE_NONE);
 
   if (text_input_manager_ && text_input_manager_->GetActiveWidget()) {
-    text_input_manager_->GetActiveWidget()->ImeConfirmComposition(
-        text, gfx::Range::InvalidRange(), false);
+    if (text.length())
+      text_input_manager_->GetActiveWidget()->ImeCommitText(
+          text, gfx::Range::InvalidRange(), 0);
+    else if (has_composition_text_)
+      text_input_manager_->GetActiveWidget()->ImeFinishComposingText(false);
   }
   has_composition_text_ = false;
 }
@@ -2490,8 +2492,7 @@ void RenderWidgetHostViewAura::FinishImeCompositionSession() {
     return;
 
   if (!!text_input_manager_ && !!text_input_manager_->GetActiveWidget()) {
-    text_input_manager_->GetActiveWidget()->ImeConfirmComposition(
-        base::string16(), gfx::Range::InvalidRange(), false);
+    text_input_manager_->GetActiveWidget()->ImeFinishComposingText(false);
   }
   ImeCancelComposition();
 }