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

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

 // 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.
 
 package org.chromium.content.browser.input;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ skipping 179 matching lines @@
         int restartCount = mInputMethodManagerWrapper.getRestartInputCounter();
         Integer[] history = mConnectionFactory.getTextInputTypeHistory();
         return stringifyKeyboardStates(showCount, hideCount, restartCount, history);
     }
 
     String stringifyKeyboardStates(int show, int hide, int restart, Integer[] history) {
         return "show count: " + show + ", hide count: " + hide + ", restart count: " + restart
                 + ", 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>() {
             @Override
             public Void call() throws Exception {
                 inputConnection.performEditorAction(EditorInfo.IME_ACTION_GO);
                 return null;
             }
         };
 
@@ skipping 313 matching lines @@
             }
         });
     }
 
     /**
      * Focus element, wait for a single state update, reset state update list.
      * @param id ID of the element to focus.
      */
     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 {
         focusElement(id, true);
     }
 
     void focusElement(final String id, boolean shouldShowKeyboard)
             throws InterruptedException, TimeoutException {
         DOMUtils.focusNode(getWebContents(), id);
         assertWaitForKeyboardStatus(shouldShowKeyboard);
@@ skipping 16 matching lines @@
         public TestInputConnectionFactory(ChromiumBaseInputConnection.Factory factory) {
             mFactory = factory;
         }
 
         @Override
         public ChromiumBaseInputConnection initializeAndGet(View view, ImeAdapter imeAdapter,
                 int inputType, int inputFlags, int inputMode, int selectionStart, int selectionEnd,
                 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);
         }
 
         @Override
         public Handler getHandler() {
             return mFactory.getHandler();
         }
 
         public Integer[] getTextInputTypeHistory() {
             Integer[] result = new Integer[mTextInputTypeList.size()];
@@ skipping 23 matching lines @@
         public void onViewAttachedToWindow() {
             mFactory.onViewAttachedToWindow();
         }
 
         @Override
         public void onViewDetachedFromWindow() {
             mFactory.onViewDetachedFromWindow();
         }
     }
 }