Revert of [Android] Adding Smart GO/NEXT feature in Chrome

content/public/android/java/src/org/chromium/content/browser/input/ImeAdapter.java

 // Copyright 2012 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.SuppressLint;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Build;
@@ skipping 13 matching lines @@
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.ExtractedText;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.base.Log;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.blink_public.web.WebFocusType;
 import org.chromium.blink_public.web.WebInputEventModifier;
 import org.chromium.blink_public.web.WebInputEventType;
 import org.chromium.blink_public.web.WebTextInputMode;
 import org.chromium.content.browser.ViewUtils;
 import org.chromium.content.browser.picker.InputDialogContainer;
 import org.chromium.content_public.browser.ImeEventObserver;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.base.ime.TextInputType;
 
 import java.lang.ref.WeakReference;
@@ skipping 582 matching lines @@
             case android.R.id.paste:
                 mWebContents.paste();
                 return true;
             default:
                 return false;
         }
     }
 
     boolean performEditorAction(int actionCode) {
         if (!isValid()) return false;
-        switch (actionCode) {
-            case EditorInfo.IME_ACTION_NEXT:
-                advanceFocusInForm(WebFocusType.FORWARD);
-                break;
-            case EditorInfo.IME_ACTION_PREVIOUS:
-                advanceFocusInForm(WebFocusType.BACKWARD);
-                break;
-            default:
-                sendSyntheticKeyPress(KeyEvent.KEYCODE_ENTER,
-                        KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
-                                | KeyEvent.FLAG_EDITOR_ACTION);
-                break;
+        if (actionCode == EditorInfo.IME_ACTION_NEXT) {
+            sendSyntheticKeyPress(KeyEvent.KEYCODE_TAB,
+                    KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                    | KeyEvent.FLAG_EDITOR_ACTION);
+        } else {
+            sendSyntheticKeyPress(KeyEvent.KEYCODE_ENTER,
+                    KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE
+                    | KeyEvent.FLAG_EDITOR_ACTION);
         }
         return true;
     }
 
-    /**
-     * Advances the focus to next input field in the current form.
-     *
-     * @param focusType indicates whether to advance forward or backward direction.
-     */
-    private void advanceFocusInForm(int focusType) {
-        if (mNativeImeAdapterAndroid == 0) return;
-        nativeAdvanceFocusInForm(mNativeImeAdapterAndroid, focusType);
-    }
-
     void notifyUserAction() {
         mInputMethodManagerWrapper.notifyUserAction();
     }
 
     @VisibleForTesting
     protected void sendSyntheticKeyPress(int keyCode, int flags) {
         long eventTime = SystemClock.uptimeMillis();
         sendKeyEvent(new KeyEvent(eventTime, eventTime,
                 KeyEvent.ACTION_DOWN, keyCode, 0, 0,
                 KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
@@ skipping 255 matching lines @@
     private native void nativeSetEditableSelectionOffsets(long nativeImeAdapterAndroid,
             int start, int end);
     private native void nativeSetComposingRegion(long nativeImeAdapterAndroid, int start, int end);
     private native void nativeDeleteSurroundingText(long nativeImeAdapterAndroid,
             int before, int after);
     private native void nativeDeleteSurroundingTextInCodePoints(
             long nativeImeAdapterAndroid, int before, int after);
     private native boolean nativeRequestTextInputStateUpdate(long nativeImeAdapterAndroid);
     private native void nativeRequestCursorUpdate(long nativeImeAdapterAndroid,
             boolean immediateRequest, boolean monitorRequest);
-    private native void nativeAdvanceFocusInForm(long nativeImeAdapterAndroid, int focusType);
 }