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

content/public/test/text_input_test_utils.h

Index: content/public/test/text_input_test_utils.h
diff --git a/content/public/test/text_input_test_utils.h b/content/public/test/text_input_test_utils.h
index 6c0c2bcdcce21d49ccd920cab5007673fd3cd5f7..f377320e69d83d3b7911ee8ca2bb18584db48e57 100644
--- a/content/public/test/text_input_test_utils.h
+++ b/content/public/test/text_input_test_utils.h
@@ -25,6 +25,10 @@ namespace gfx {
 class Range;
 }
 
+namespace ui {
+struct CompositionUnderline;
+}
+
 namespace content {
 
 class MessageLoopRunner;
@@ -65,6 +69,15 @@ bool RequestCompositionInfoFromActiveWidget(WebContents* web_contents);
 // Returns true if |frame| has a focused editable element.
 bool DoesFrameHaveFocusedEditableElement(RenderFrameHost* frame);
 
+// Sends a request to the RenderWidget corresponding to |rwh| to commit the
+// given |text|.
+void SendImeCommitTextToWidget(
+    RenderWidgetHost* rwh,
+    const base::string16& text,
+    const std::vector<ui::CompositionUnderline>& underlines,
+    const gfx::Range& replacement_range,
+    int relative_cursor_pos);
+
 // This class provides the necessary API for accessing the state of and also
 // observing the TextInputManager for WebContents.
 class TextInputManagerTester {
@@ -106,7 +119,7 @@ class TextInputManagerTester {
 
   // Returns the RenderWidgetHostView which has most recently updated any of its
   // state (e.g., TextInputState or otherwise).
-  const RenderWidgetHostView* GetUpdatedView();
+  RenderWidgetHostView* GetUpdatedView();
 
   // Returns true if a call to TextInputManager::UpdateTextInputState has led
   // to a change in TextInputState (since the time the observer has been