Add a mojo channel for frame messages.

content/browser/android/ime_adapter_android.cc

 // Copyright 2017 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/android/ime_adapter_android.h"
 
 #include <android/input.h>
 #include <algorithm>
 #include <vector>
 
@@ skipping 275 matching lines @@
 
 void ImeAdapterAndroid::SetEditableSelectionOffsets(
     JNIEnv*,
     const JavaParamRef<jobject>&,
     int start,
     int end) {
   RenderFrameHost* rfh = GetFocusedFrame();
   if (!rfh)
     return;
 
-  rfh->Send(new InputMsg_SetEditableSelectionOffsets(rfh->GetRoutingID(), start,
-                                                     end));
+  rfh->GetFrameInputHandler()->SetEditableSelectionOffsets(start, end);
 }
 
 void ImeAdapterAndroid::SetCharacterBounds(
     const std::vector<gfx::RectF>& character_bounds) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
   if (obj.is_null())
     return;
 
   const size_t coordinates_array_size = character_bounds.size() * 4;
@@ skipping 13 matching lines @@
 }
 
 void ImeAdapterAndroid::SetComposingRegion(JNIEnv*,
                                            const JavaParamRef<jobject>&,
                                            int start,
                                            int end) {
   RenderFrameHost* rfh = GetFocusedFrame();
   if (!rfh)
     return;
 
-  std::vector<blink::WebCompositionUnderline> underlines;
-  underlines.push_back(blink::WebCompositionUnderline(
-      0, end - start, SK_ColorBLACK, false, SK_ColorTRANSPARENT));
+  std::vector<ui::CompositionUnderline> underlines;
+  underlines.push_back(ui::CompositionUnderline(0, end - start, SK_ColorBLACK,
+                                                false, SK_ColorTRANSPARENT));
 
-  rfh->Send(new InputMsg_SetCompositionFromExistingText(
-      rfh->GetRoutingID(), start, end, underlines));
+  rfh->GetFrameInputHandler()->SetCompositionFromExistingText(start, end,
+                                                              underlines);
 }
 
 void ImeAdapterAndroid::DeleteSurroundingText(JNIEnv*,
                                               const JavaParamRef<jobject>&,
                                               int before,
                                               int after) {
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(GetFocusedFrame());
   if (rfh)
-    rfh->DeleteSurroundingText(before, after);
+    rfh->GetFrameInputHandler()->DeleteSurroundingText(before, after);
 }
 
 void ImeAdapterAndroid::DeleteSurroundingTextInCodePoints(
     JNIEnv*,
     const JavaParamRef<jobject>&,
     int before,
     int after) {
   RenderFrameHostImpl* rfh =
       static_cast<RenderFrameHostImpl*>(GetFocusedFrame());
   if (rfh)
-    rfh->DeleteSurroundingTextInCodePoints(before, after);
+    rfh->GetFrameInputHandler()->DeleteSurroundingTextInCodePoints(before,

[Avi (use Gerrit), 2017/05/26 16:08:40]

Multi-line if() body needs {}.

[dtapuska, 2017/05/26 16:25:24]

Done.

+                                                                   after);
 }
 
 bool ImeAdapterAndroid::RequestTextInputStateUpdate(
     JNIEnv* env,
     const JavaParamRef<jobject>&) {
   RenderWidgetHostImpl* rwhi = GetFocusedWidget();
   if (!rwhi)
     return false;
   rwhi->Send(new InputMsg_RequestTextInputStateUpdate(rwhi->GetRoutingID()));
   return true;
@@ skipping 47 matching lines @@
   Java_ImeAdapter_populateUnderlinesFromSpans(
       env, obj, text, reinterpret_cast<jlong>(&underlines));
 
   // Sort spans by |.startOffset|.
   std::sort(underlines.begin(), underlines.end());
 
   return underlines;
 }
 
 }  // namespace content