Relanding [Android] Adding Smart GO/NEXT feature in Chrome

content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java

Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java
index 8ec3f26ae7f5d27085c2e60c2afce103d4181d34..32e8552e9837a8f1a84a9367132614a62c2800da 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeActivityTestRule.java
@@ -197,6 +197,10 @@ class ImeActivityTestRule extends ContentShellActivityTestRule {
                 + ", input type history: " + Arrays.deepToString(history);
     }
 
+    void performEditorAction(final int action) {
+        mConnection.performEditorAction(action);
+    }
+
     void performGo(TestCallbackHelperContainer testCallbackHelperContainer) throws Throwable {
         final InputConnection inputConnection = mConnection;
         final Callable<Void> callable = new Callable<Void>() {
@@ -530,10 +534,10 @@ class ImeActivityTestRule extends ContentShellActivityTestRule {
      */
     void focusElementAndWaitForStateUpdate(String id)
             throws InterruptedException, TimeoutException {
-        resetUpdateSelectionList();
+        resetAllStates();
         focusElement(id);
         waitAndVerifyUpdateSelection(0, 0, 0, -1, -1);
-        resetUpdateSelectionList();
+        resetAllStates();
     }
 
     void focusElement(final String id) throws InterruptedException, TimeoutException {
@@ -570,7 +574,7 @@ class ImeActivityTestRule extends ContentShellActivityTestRule {
                 EditorInfo outAttrs) {
             mTextInputTypeList.add(inputType);
             mOutAttrs = outAttrs;
-            return mFactory.initializeAndGet(view, imeAdapter, inputType, inputMode, inputFlags,
+            return mFactory.initializeAndGet(view, imeAdapter, inputType, inputFlags, inputMode,
                     selectionStart, selectionEnd, outAttrs);
         }