Fix a recent regression in IME inside OOPIFs (Merge to M-57)

content/public/test/text_input_test_utils.cc

 // Copyright 2016 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/public/test/text_input_test_utils.h"
 
 #include <unordered_set>
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
@@ skipping 53 matching lines @@
 
   void set_on_ime_composition_range_changed_callback(
       const base::Closure& callback) {
     on_ime_composition_range_changed_callback_ = callback;
   }
 
   void set_on_text_selection_changed_callback(const base::Closure& callback) {
     on_text_selection_changed_callback_ = callback;
   }
 
-  const RenderWidgetHostView* GetUpdatedView() const { return updated_view_; }
+  RenderWidgetHostView* GetUpdatedView() const { return updated_view_; }
 
   bool text_input_state_changed() const { return text_input_state_changed_; }
 
   TextInputManager* text_input_manager() const { return text_input_manager_; }
 
   // TextInputManager::Observer implementations.
   void OnUpdateTextInputStateCalled(TextInputManager* text_input_manager,
                                     RenderWidgetHostViewBase* updated_view,
                                     bool did_change_state) override {
     if (text_input_manager_ != text_input_manager)
@@ skipping 170 matching lines @@
   manager->GetActiveWidget()->Send(new InputMsg_RequestCompositionUpdate(
       manager->GetActiveWidget()->GetRoutingID(), true, false));
   return true;
 }
 
 bool DoesFrameHaveFocusedEditableElement(RenderFrameHost* frame) {
   return static_cast<RenderFrameHostImpl*>(frame)
       ->has_focused_editable_element();
 }
 
+void SendImeCommitTextToWidget(
+    RenderWidgetHost* rwh,
+    const base::string16& text,
+    const std::vector<ui::CompositionUnderline>& underlines,
+    const gfx::Range& replacement_range,
+    int relative_cursor_pos) {
+  std::vector<blink::WebCompositionUnderline> web_composition_underlines;
+  for (auto underline : underlines) {
+    web_composition_underlines.emplace_back(
+        static_cast<int>(underline.start_offset),
+        static_cast<int>(underline.end_offset), underline.color,
+        underline.thick, underline.background_color);
+  }
+  RenderWidgetHostImpl::From(rwh)->ImeCommitText(
+      text, web_composition_underlines, replacement_range, relative_cursor_pos);
+}
+
 size_t GetRegisteredViewsCountFromTextInputManager(WebContents* web_contents) {
   std::unordered_set<RenderWidgetHostView*> views;
   TextInputManager* manager =
       static_cast<WebContentsImpl*>(web_contents)->GetTextInputManager();
   return !!manager ? manager->GetRegisteredViewsCountForTesting() : 0;
 }
 
 RenderWidgetHostView* GetActiveViewFromWebContents(WebContents* web_contents) {
   return static_cast<WebContentsImpl*>(web_contents)
       ->GetTextInputManager()
@@ skipping 43 matching lines @@
     return false;
   *value = state->value;
   return true;
 }
 
 const RenderWidgetHostView* TextInputManagerTester::GetActiveView() {
   DCHECK(observer_->text_input_manager());
   return observer_->text_input_manager()->active_view_for_testing();
 }
 
-const RenderWidgetHostView* TextInputManagerTester::GetUpdatedView() {
+RenderWidgetHostView* TextInputManagerTester::GetUpdatedView() {
   return observer_->GetUpdatedView();
 }
 
 bool TextInputManagerTester::GetCurrentTextSelectionLength(size_t* length) {
   DCHECK(observer_->text_input_manager());
 
   if (!observer_->text_input_manager()->GetActiveWidget())
     return false;
 
   *length = observer_->text_input_manager()->GetTextSelection()->text.size();
@@ skipping 68 matching lines @@
 
 #ifdef USE_AURA
   RenderWidgetHostViewAura* view = static_cast<RenderWidgetHostViewAura*>(
       web_contents->GetRenderWidgetHostView());
   observer.reset(new InputMethodObserverAura(view->GetInputMethod()));
 #endif
   return observer;
 }
 
 }  // namespace content