| Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| similarity index 97%
|
| rename from chrome/android/javatests_shell/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| rename to chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| index 3fae887f42ba8b8a5e3477bd8f27836a18671ead..8ddc33dda917a49e76562999a2b197e673d6b552 100644
|
| --- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java
|
| @@ -9,7 +9,8 @@ import android.test.suitebuilder.annotation.SmallTest;
|
| import org.chromium.base.test.util.Feature;
|
| import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
|
| import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
|
| -import org.chromium.chrome.shell.ChromeShellTestBase;
|
| +import org.chromium.chrome.test.util.ApplicationData;
|
| +import org.chromium.content.browser.test.NativeLibraryTestBase;
|
|
|
| import java.util.LinkedList;
|
| import java.util.List;
|
| @@ -18,16 +19,15 @@ import java.util.concurrent.ExecutionException;
|
| /**
|
| * Tests for Chrome on Android's usage of the PersonalDataManager API.
|
| */
|
| -public class PersonalDataManagerTest extends ChromeShellTestBase {
|
| +public class PersonalDataManagerTest extends NativeLibraryTestBase {
|
|
|
| private AutofillTestHelper mHelper;
|
|
|
| @Override
|
| public void setUp() throws Exception {
|
| super.setUp();
|
| - clearAppData();
|
| - launchChromeShellWithBlankPage();
|
| - assertTrue(waitForActiveShellToBeDoneLoading());
|
| + ApplicationData.clearAppData(getInstrumentation().getTargetContext());
|
| + loadNativeLibraryAndInitBrowserProcess();
|
|
|
| mHelper = new AutofillTestHelper();
|
| }
|
|
|