Handle newCursorPosition correctly for Android's commitText()

content/browser/browser_plugin/browser_plugin_guest.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/browser_plugin/browser_plugin_guest.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 834 matching lines @@
     const std::string& text,
     const std::vector<blink::WebCompositionUnderline>& underlines,
     int selection_start,
     int selection_end) {
   Send(new InputMsg_ImeSetComposition(routing_id(),
                                       base::UTF8ToUTF16(text), underlines,
                                       gfx::Range::InvalidRange(),
                                       selection_start, selection_end));
 }
 
-void BrowserPluginGuest::OnImeConfirmComposition(
-    int browser_plugin_instance_id,
-    const std::string& text,
-    bool keep_selection) {
+void BrowserPluginGuest::OnImeConfirmComposition(int browser_plugin_instance_id,
+                                                 const std::string& text,
+                                                 bool keep_selection,
+                                                 int newCursorPosition) {
   Send(new InputMsg_ImeConfirmComposition(routing_id(),
                                           base::UTF8ToUTF16(text),
                                           gfx::Range::InvalidRange(),
-                                          keep_selection));
+                                          keep_selection,
+                                          newCursorPosition));
 }
 
 void BrowserPluginGuest::OnExtendSelectionAndDelete(
     int browser_plugin_instance_id,
     int before,
     int after) {
   RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(
       web_contents()->GetFocusedFrame());
   if (rfh)
     rfh->ExtendSelectionAndDelete(before, after);
@@ skipping 133 matching lines @@
           range, character_bounds);
 }
 #endif
 
 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
   if (delegate_)
     delegate_->SetContextMenuPosition(position);
 }
 
 }  // namespace content