Revert: Reland: Move autofill tests chrome ChromeShellTest to ChromePublicTest

chrome/android/javatests_shell/src/org/chromium/chrome/browser/autofill/PersonalDataManagerTest.java

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