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

content/public/test/text_input_test_utils.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEXT_INPUT_TEST_UTILS_H_
 #define CONTENT_PUBLIC_TEST_TEXT_INPUT_TEST_UTILS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 
 #ifdef OS_MACOSX
 #include "content/public/browser/browser_message_filter.h"
 #endif
 
 namespace ipc {
 class Message;
 }
 
 namespace gfx {
 class Range;
 }
 
+namespace ui {
+struct CompositionUnderline;
+}
+
 namespace content {
 
 class MessageLoopRunner;
 class RenderFrameHost;
 class RenderProcessHost;
 class RenderWidgetHost;
 class RenderWidgetHostView;
 class RenderWidgetHostViewBase;
 class WebContents;
 struct TextInputState;
@@ skipping 20 matching lines @@
 
 // This method will send a request for an immediate update on composition range
 // from TextInputManager's active widget corresponding to the |web_contents|.
 // This function will return false if the request is not successfully sent;
 // either due to missing TextInputManager or lack of an active widget.
 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 {
  public:
   TextInputManagerTester(WebContents* web_contents);
   virtual ~TextInputManagerTester();
 
   // Sets a callback which is invoked when a RWHV calls UpdateTextInputState
   // on the TextInputManager which is being observed.
   void SetUpdateTextInputStateCalledCallback(const base::Closure& callback);
@@ skipping 21 matching lines @@
   // Returns true if there is a focused <input> and populates |length| with the
   // length of the selected text range in the focused view.
   bool GetCurrentTextSelectionLength(size_t* length);
 
   // Returns the RenderWidgetHostView with a focused <input> element or nullptr
   // if none exists.
   const RenderWidgetHostView* GetActiveView();
 
   // 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
   // created).
   bool IsTextInputStateChanged();
 
  private:
   // The actual internal observer of the TextInputManager.
   class InternalObserver;
 
@@ skipping 107 matching lines @@
                                     const gfx::Range& range);
 
 // Returns the total count of NSWindows instances which belong to the currently
 // running NSApplication.
 size_t GetOpenNSWindowsCount();
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEXT_INPUT_TEST_UTILS_H_