Reland: Move autofill tests chrome ChromeShellTest to ChromePublicTest

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.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.test.suitebuilder.annotation.SmallTest;
 import android.text.TextUtils;
 
-import org.chromium.base.CommandLine;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
-import org.chromium.chrome.shell.ChromeShellTestBase;
+import org.chromium.chrome.browser.ChromeActivity;
+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_public.browser.WebContents;
 
 import java.util.concurrent.TimeoutException;
 
 /**
  * Integration tests for the AutofillPopup.
  */
-public class AutofillDialogControllerTest extends ChromeShellTestBase {
-    private static final String SWITCH_REDUCE_SECURITY_FOR_TESTING = "reduce-security-for-testing";
+@CommandLineFlags.Add("reduce-security-for-testing")
+public class AutofillDialogControllerTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private static final long DIALOG_CALLBACK_DELAY_MILLISECONDS = 50;
 
     private static final String TEST_NAME = "Joe Doe";
     private static final String TEST_PHONE = "(415)413-0703";
     private static final String TEST_PHONE_UNFORMATTED = "4154130703";
     private static final String TEST_EMAIL = "email@server.com";
 
     private static final String TEST_CC_NUMBER = "4111111111111111";
     private static final String TEST_CC_CSC = "123";
     private static final int TEST_CC_EXP_MONTH = 11;
@@ skipping 129 matching lines @@
             if (requestShipping) {
                 sb.append("<input id=\"id-h-tel\" autocomplete=\"shipping tel\" value=\"W\">"
                         + "<input id=\"id-tel\" autocomplete=\"tel\" value=\"W\">");
             }
             sb.append("</fieldset>");
         }
         sb.append(HTML_POSTLUDE);
         return UrlUtils.encodeHtmlDataUri(sb.toString());
     }
 
+    public AutofillDialogControllerTest() {
+        super(ChromeActivity.class);
+    }
+
     @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        clearAppData();
-        CommandLine.init(new String[]{});
-        CommandLine.getInstance().appendSwitch(SWITCH_REDUCE_SECURITY_FOR_TESTING);
+    public void startMainActivity() throws InterruptedException {
+        // Don't launch activity automatically.
     }
 
     @MediumTest
     @Feature({"autofill"})
     public void testFieldsAreFilledMinimal() throws InterruptedException, TimeoutException {
         final boolean requestFullBilling = false;
         final boolean requestShipping = false;
         final boolean requestPhoneNumbers = false;
         verifyFieldsAreFilled(requestFullBilling, requestShipping, requestPhoneNumbers);
     }
@@ skipping 337 matching lines @@
                 ? "<input id=\"id-opt-cc-csc\" autocomplete=\"cc-csc\">"
                 : "";
         final String url = UrlUtils.encodeHtmlDataUri(
                 HTML_PRELUDE
                 + htmlFragment
                 + optionalCcFragment
                 + HTML_POSTLUDE);
 
         setUpAndRequestAutocomplete(url, requestFullBilling, requestShipping, requestPhoneNumbers);
 
-        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
+        final WebContents webContents = getActivity().getCurrentContentViewCore().getWebContents();
 
         assertEquals(actualId + " did not match",
                 expected, DOMUtils.getNodeValue(webContents, actualId));
         if (requestCcInfo) {
             assertEquals("cc-csc did not match",
                     TEST_CC_CSC, DOMUtils.getNodeValue(webContents, "id-opt-cc-csc"));
         }
     }
 
     private void verifyFieldsAreFilled(final boolean requestFullBilling,
             final boolean requestShipping, final boolean requestPhoneNumbers)
             throws InterruptedException, TimeoutException {
         setUpAndRequestAutocomplete(
                 generatePage(requestFullBilling, requestShipping, requestPhoneNumbers),
                 requestFullBilling, requestShipping, requestPhoneNumbers);
 
-        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
+        final WebContents webContents = getActivity().getCurrentContentViewCore().getWebContents();
 
         assertEquals("billing name did not match",
                 TEST_NAME, DOMUtils.getNodeValue(webContents, "id-billing-name"));
         assertEquals("email did not match",
                 TEST_EMAIL, DOMUtils.getNodeValue(webContents, "id-email"));
 
         assertEquals("cc-name did not match",
                 TEST_NAME, DOMUtils.getNodeValue(webContents, "id-cc-name"));
 
         assertEquals("cc-number did not match",
@@ skipping 93 matching lines @@
                 requestFullBilling, requestShipping, requestPhoneNumbers,
                 true);
     }
 
     private void setUpAndRequestAutocompleteImpl(final String url,
             final boolean requestFullBilling,
             final boolean requestShipping,
             final boolean requestPhoneNumbers,
             final boolean expectFailure)
             throws InterruptedException, TimeoutException {
-        launchChromeShellWithUrl(url);
-        assertTrue(waitForActiveShellToBeDoneLoading());
+        startMainActivityWithURL(url);
 
-        final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
-        final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
+        final ContentViewCore viewCore = getActivity().getCurrentContentViewCore();
+        final WebContents webContents = getActivity().getCurrentContentViewCore().getWebContents();
 
         AutofillDialogResult.ResultWallet result = new AutofillDialogResult.ResultWallet(
                 TEST_EMAIL, "Google Transaction ID",
                 new AutofillDialogResult.ResultCard(
                         TEST_CC_EXP_MONTH, TEST_CC_EXP_YEAR,
                         TEST_CC_NUMBER, TEST_CC_CSC),
                 new AutofillDialogResult.ResultAddress(
                         TEST_NAME, TEST_PHONE,
                         TEST_BILLING_STREET,
                         TEST_BILLING_CITY, TEST_BILLING_DL, TEST_BILLING_STATE,
@@ skipping 38 matching lines @@
                             return false;
                         } catch (TimeoutException e) {
                             return false;
                         }
                         return TextUtils.equals("succeeded", wasAutocompleted)
                                 || TextUtils.equals("failed", wasAutocompleted);
                     }
                 }));
     }
 }