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

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

 // Copyright 2013 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.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.res.Configuration;
@@ skipping 13 matching lines @@
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.ContentJUnit4ClassRunner;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.ui.base.ime.TextInputType;
 
-import java.util.ArrayList;
 import java.util.concurrent.Callable;
 
 /**
  * IME (input method editor) and text input tests.
  */
 @RunWith(ContentJUnit4ClassRunner.class)
 public class ImeTest {
     @Rule
     public ImeActivityTestRule mRule = new ImeActivityTestRule();
 
@@ skipping 370 matching lines @@
         mRule.commitText("hello", 1);
         mRule.waitAndVerifyUpdateSelection(0, 5, 5, -1, -1);
         mRule.restartInput();
         DOMUtils.clickNode(mRule.getContentViewCore(), "input_text");
         mRule.assertWaitForKeyboardStatus(true);
 
         Assert.assertEquals(5, mRule.getConnectionFactory().getOutAttrs().initialSelStart);
         Assert.assertEquals(5, mRule.getConnectionFactory().getOutAttrs().initialSelEnd);
     }
 
-    private static int getImeAction(EditorInfo editorInfo) {
-        return editorInfo.imeOptions & EditorInfo.IME_MASK_ACTION;
-    }
-
     @Test
-    @SmallTest
-    @Feature({"TextInput", "Main"})
-    public void testAdvanceFocusNextAndPrevious() throws Exception {
-        mRule.focusElement("textarea");
-        // Forward direction focus. Excessive focus advance should be ignored.
-        for (int i = 0; i < 10; ++i) {
-            // Forward direction focus.
-            mRule.performEditorAction(EditorInfo.IME_ACTION_NEXT);
-        }
-        mRule.waitForKeyboardStates(7, 0, 7,
-                new Integer[] {TextInputType.TEXT_AREA, TextInputType.TEXT_AREA,
-                        TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.CONTENT_EDITABLE,
-                        TextInputType.SEARCH, TextInputType.TEXT});
-        ArrayList<EditorInfo> editorInfoList =
-                mRule.getInputMethodManagerWrapper().getEditorInfoList();
-        Assert.assertEquals(7, editorInfoList.size());
-        // textarea.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(0)));
-        // textarea2.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(1)));
-        // input_number1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NEXT, getImeAction(editorInfoList.get(2)));
-        // input_number2.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NEXT, getImeAction(editorInfoList.get(3)));
-        // content_editable1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(4)));
-        // search1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_SEARCH, getImeAction(editorInfoList.get(5)));
-        // input_text1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_GO, getImeAction(editorInfoList.get(6)));
-
-        mRule.resetAllStates();
-
-        // Backward direction focus. Excessive focus advance should be ignored.
-        for (int i = 0; i < 10; ++i) {
-            // Backward direction focus.
-            mRule.performEditorAction(EditorInfo.IME_ACTION_PREVIOUS);
-        }
-        mRule.waitForKeyboardStates(6, 0, 6,
-                new Integer[] {TextInputType.SEARCH, TextInputType.CONTENT_EDITABLE,
-                        TextInputType.NUMBER, TextInputType.NUMBER, TextInputType.TEXT_AREA,
-                        TextInputType.TEXT_AREA});
-        editorInfoList = mRule.getInputMethodManagerWrapper().getEditorInfoList();
-        Assert.assertEquals(6, editorInfoList.size());
-        // search1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_SEARCH, getImeAction(editorInfoList.get(0)));
-        // content_editable1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(1)));
-        // input_number2.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NEXT, getImeAction(editorInfoList.get(2)));
-        // input_number1.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NEXT, getImeAction(editorInfoList.get(3)));
-        // textarea2.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(4)));
-        // textarea.
-        Assert.assertEquals(EditorInfo.IME_ACTION_NONE, getImeAction(editorInfoList.get(5)));
-    }
-
-    @Test
     @SmallTest
     @Feature({"TextInput"})
     public void testShowAndHideSoftInput() throws Exception {
         mRule.focusElement("input_radio", false);
 
         // hideSoftKeyboard(), mRule.restartInput()
         mRule.waitForKeyboardStates(0, 1, 1, new Integer[] {});
 
         // When input connection is null, we still need to set flags to prevent InputMethodService
         // from entering fullscreen mode and from opening custom UI.
@@ skipping 1065 matching lines @@
         });
         Assert.assertEquals("abc", mRule.runBlockingOnImeThread(new Callable<CharSequence>() {
             @Override
             public CharSequence call() throws Exception {
                 return connection.getTextBeforeCursor(5, 0);
             }
         }));
     }
 
 }