Reland: Move autofill tests chrome ChromeShellTest to ChromePublicTest

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.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.chrome.browser.autofill;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
-import org.chromium.chrome.shell.ChromeShellTestBase;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.ContentViewCore;
 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.TestInputMethodManagerWrapper;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.ui.autofill.AutofillPopup;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the AutofillPopup.
  */
-public class AutofillPopupTest extends ChromeShellTestBase {
+public class AutofillPopupTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     private static final String FIRST_NAME = "John";
     private static final String LAST_NAME = "Smith";
     private static final String COMPANY_NAME = "Acme Inc.";
     private static final String ADDRESS_LINE1 = "1 Main";
     private static final String ADDRESS_LINE2 = "Apt A";
     private static final String STREET_ADDRESS_TEXTAREA = ADDRESS_LINE1 + "\n" + ADDRESS_LINE2;
     private static final String CITY = "San Francisco";
     private static final String DEPENDENT_LOCALITY = "";
     private static final String STATE = "CA";
@@ skipping 65 matching lines @@
             + "<select id=\"co\" autocomplete=\"country\"><br>"
             + "<option value=\"GB\">Great Britain</option>"
             + "<option value=\"BR\">Brazil</option>"
             + "</select>"
             + "<input type=\"submit\" />"
             + "</form></body></html>");
 
     private AutofillTestHelper mHelper;
     private List<AutofillLogger.LogEntry> mAutofillLoggedEntries;
 
+    public AutofillPopupTest() {
+        super(ChromeActivity.class);
+    }
+
+    @Override
+    public void startMainActivity() throws InterruptedException {
+        // Don't launch activity automatically.
+    }
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        clearAppData();
         mAutofillLoggedEntries = new ArrayList<AutofillLogger.LogEntry>();
         AutofillLogger.setLogger(
                 new AutofillLogger.Logger() {
                     @Override
                     public void didFillField(AutofillLogger.LogEntry logEntry) {
                         mAutofillLoggedEntries.add(logEntry);
                     }
                 }
         );
     }
 
     private void loadAndFillForm(
             final String formDataUrl, final String inputText)
             throws InterruptedException, ExecutionException, TimeoutException {
-        launchChromeShellWithUrl(formDataUrl);
-        assertTrue(waitForActiveShellToBeDoneLoading());
+        startMainActivityWithURL(formDataUrl);
         mHelper = new AutofillTestHelper();
 
         // The TestInputMethodManagerWrapper intercepts showSoftInput so that a keyboard is never
         // brought up.
-        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final ContentViewCore viewCore = getActivity().getCurrentContentViewCore();
         final WebContents webContents = viewCore.getWebContents();
         final ViewGroup view = viewCore.getContainerView();
         final TestInputMethodManagerWrapper immw =
                 new TestInputMethodManagerWrapper(viewCore);
         viewCore.getImeAdapterForTest().setInputMethodManagerWrapper(immw);
 
         // Add an Autofill profile.
         AutofillProfile profile = new AutofillProfile(
                 "" /* guid */, ORIGIN, FIRST_NAME + " " + LAST_NAME, COMPANY_NAME,
                 STREET_ADDRESS_TEXTAREA,
@@ skipping 32 matching lines @@
 
     /**
      * Tests that bringing up an Autofill and clicking on the first entry fills out the expected
      * Autofill information.
      */
     @MediumTest
     @Feature({"autofill"})
     public void testClickAutofillPopupSuggestion()
             throws InterruptedException, ExecutionException, TimeoutException {
         loadAndFillForm(BASIC_PAGE_DATA, "J");
-        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+        final ContentViewCore viewCore = getActivity().getCurrentContentViewCore();
         final WebContents webContents = viewCore.getWebContents();
 
         assertEquals("First name did not match",
                 FIRST_NAME, DOMUtils.getNodeValue(webContents, "fn"));
         assertEquals("Last name did not match",
                 LAST_NAME, DOMUtils.getNodeValue(webContents, "ln"));
         assertEquals("Street address (textarea) did not match",
                 STREET_ADDRESS_TEXTAREA, DOMUtils.getNodeValue(webContents, "sa"));
         assertEquals("Address line 1 did not match",
                 ADDRESS_LINE1, DOMUtils.getNodeValue(webContents, "a1"));
@@ skipping 136 matching lines @@
     private void assertLogged(String autofilledValue, String profileFullName) {
         for (AutofillLogger.LogEntry entry : mAutofillLoggedEntries) {
             if (entry.getAutofilledValue().equals(autofilledValue)
                     && entry.getProfileFullName().equals(profileFullName)) {
                 return;
             }
         }
         fail("Logged entry not found [" + autofilledValue + "," + profileFullName + "]");
     }
 }