Rename chrome/android/javatests to javatests_shell.

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
deleted file mode 100644
index 34356d9be660e7ce43547c647656e866d3b63c7d..0000000000000000000000000000000000000000
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-// 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.chrome.browser.autofill;
-
-import android.test.suitebuilder.annotation.SmallTest;
-
-import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
-
-import org.chromium.base.ThreadUtils;
-import org.chromium.base.annotations.SuppressFBWarnings;
-import org.chromium.base.test.util.Feature;
-import org.chromium.chrome.shell.ChromeShellActivity;
-import org.chromium.chrome.shell.ChromeShellTestBase;
-import org.chromium.content.browser.test.util.Criteria;
-import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.content.browser.test.util.TouchCommon;
-import org.chromium.ui.DropdownItem;
-import org.chromium.ui.autofill.AutofillPopup;
-import org.chromium.ui.autofill.AutofillPopup.AutofillPopupDelegate;
-import org.chromium.ui.autofill.AutofillSuggestion;
-import org.chromium.ui.base.ActivityWindowAndroid;
-import org.chromium.ui.base.ViewAndroidDelegate;
-import org.chromium.ui.base.WindowAndroid;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-/**
- * Tests the Autofill's java code for creating the AutofillPopup object, opening and selecting
- * popups.
- */
-public class AutofillTest extends ChromeShellTestBase {
-
-    private AutofillPopup mAutofillPopup;
-    private WindowAndroid mWindowAndroid;
-    private MockAutofillCallback mMockAutofillCallback;
-
-    @SuppressFBWarnings("URF_UNREAD_FIELD")
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        final ChromeShellActivity activity = launchChromeShellWithBlankPage();
-        assertNotNull(activity);
-        waitForActiveShellToBeDoneLoading();
-
-        mMockAutofillCallback = new MockAutofillCallback();
-        mWindowAndroid = new ActivityWindowAndroid(activity);
-        final ViewAndroidDelegate viewDelegate =
-                activity.getActiveContentViewCore().getViewAndroidDelegate();
-
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                mAutofillPopup = new AutofillPopup(activity, viewDelegate, mMockAutofillCallback);
-                mAutofillPopup.filterAndShow(new AutofillSuggestion[0], false);
-                mAutofillPopup.setAnchorRect(50, 500, 500, 50);
-            }
-        });
-    }
-
-    private static final long CALLBACK_TIMEOUT_MS = scaleTimeout(4000);
-    private static final int CHECK_INTERVAL_MS = 100;
-
-    private class MockAutofillCallback implements AutofillPopupDelegate{
-        private final AtomicBoolean mGotPopupSelection = new AtomicBoolean(false);
-        public int mListIndex = -1;
-
-        @Override
-        public void suggestionSelected(int listIndex) {
-            mListIndex = listIndex;
-            mAutofillPopup.dismiss();
-            mGotPopupSelection.set(true);
-        }
-
-        public boolean waitForCallback() throws InterruptedException {
-            return CriteriaHelper.pollForCriteria(new Criteria() {
-                @Override
-                public boolean isSatisfied() {
-                    return mGotPopupSelection.get();
-                }
-            }, CALLBACK_TIMEOUT_MS, CHECK_INTERVAL_MS);
-        }
-
-        @Override
-        public void dismissed() {
-        }
-    }
-
-    private AutofillSuggestion[] createTwoAutofillSuggestionArray() {
-        return new AutofillSuggestion[] {
-            new AutofillSuggestion("Sherlock Holmes", "221B Baker Street", DropdownItem.NO_ICON,
-                42),
-            new AutofillSuggestion("Arthur Dent", "West Country", DropdownItem.NO_ICON, 43),
-        };
-    }
-
-    private AutofillSuggestion[] createFiveAutofillSuggestionArray() {
-        return new AutofillSuggestion[] {
-            new AutofillSuggestion("Sherlock Holmes", "221B Baker Street", DropdownItem.NO_ICON,
-                42),
-            new AutofillSuggestion("Arthur Dent", "West Country", DropdownItem.NO_ICON, 43),
-            new AutofillSuggestion("Arthos", "France", DropdownItem.NO_ICON, 44),
-            new AutofillSuggestion("Porthos", "France", DropdownItem.NO_ICON, 45),
-            new AutofillSuggestion("Aramis", "France", DropdownItem.NO_ICON, 46),
-        };
-    }
-
-    public boolean openAutofillPopupAndWaitUntilReady(final AutofillSuggestion[] suggestions)
-            throws InterruptedException {
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                mAutofillPopup.filterAndShow(suggestions, false);
-            }
-        });
-        return CriteriaHelper.pollForCriteria(new Criteria() {
-            @Override
-            public boolean isSatisfied() {
-                return mAutofillPopup.getListView().getChildCount() > 0;
-            }
-        });
-    }
-
-    @SmallTest
-    @Feature({"autofill"})
-    public void testAutofillWithDifferentNumberSuggestions() throws Exception {
-        assertTrue(openAutofillPopupAndWaitUntilReady(createTwoAutofillSuggestionArray()));
-        assertEquals(2, mAutofillPopup.getListView().getCount());
-
-        assertTrue(openAutofillPopupAndWaitUntilReady(createFiveAutofillSuggestionArray()));
-        assertEquals(5, mAutofillPopup.getListView().getCount());
-    }
-
-    @SmallTest
-    @Feature({"autofill"})
-    public void testAutofillClickFirstSuggestion() throws Exception {
-        AutofillSuggestion[] suggestions = createTwoAutofillSuggestionArray();
-        assertTrue(openAutofillPopupAndWaitUntilReady(suggestions));
-        assertEquals(2, mAutofillPopup.getListView().getCount());
-
-        TouchCommon.singleClickViewRelative(mAutofillPopup.getListView(), 10, 10);
-        assertTrue(mMockAutofillCallback.waitForCallback());
-
-        assertEquals(0, mMockAutofillCallback.mListIndex);
-    }
-}