Use Sync FakeServer in Android tests via custom APK

chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java

Index: chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java
similarity index 92%
rename from chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
rename to chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java
index 768d33fda0a54f076290bdb3a1d4a6d0579a6156..4d0efd6acd833f1cd18adf5c2dac1b0324770fd5 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java
@@ -6,17 +6,17 @@ package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
+import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
 
 import org.chromium.base.ThreadUtils;
-import org.chromium.base.test.util.HostDrivenTest;
+import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGenerator;
 import org.chromium.chrome.browser.identity.UniqueIdentificationGeneratorFactory;
 import org.chromium.chrome.browser.identity.UuidBasedUniqueIdentificationGenerator;
 import org.chromium.chrome.shell.ChromeShellActivity;
 import org.chromium.chrome.shell.ChromeShellTestBase;
 import org.chromium.chrome.shell.sync.SyncController;
-import org.chromium.chrome.test.util.browser.sync.SyncTestUtil;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -65,10 +65,24 @@ public class SyncTest extends ChromeShellTestBase {
                 mSyncController = SyncController.get(mContext);
             }
         });
-        SyncTestUtil.verifySyncServerIsRunning();
+        SyncTestUtil.useFakeServer(getInstrumentation().getTargetContext());
     }
 
-    @HostDrivenTest
+    @Override
+    protected void tearDown() throws Exception {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mSyncController.stop();
+                SyncTestUtil.deleteFakeServer();
+            }
+        });
+
+        super.tearDown();
+    }
+
+    @LargeTest
+    @Feature({"Sync"})
     public void testGetAboutSyncInfoYieldsValidData() throws Throwable {
         setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
 
@@ -86,7 +100,8 @@ public class SyncTest extends ChromeShellTestBase {
         assertTrue("Couldn't get about info.", gotInfo);
     }
 
-    @HostDrivenTest
+    @LargeTest
+    @Feature({"Sync"})
     public void testAboutSyncPageDisplaysCurrentSyncStatus() throws InterruptedException {
         setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
 
@@ -130,7 +145,8 @@ public class SyncTest extends ChromeShellTestBase {
                 hadExpectedStatus);
     }
 
-    @HostDrivenTest
+    @LargeTest
+    @Feature({"Sync"})
     public void testDisableAndEnableSync() throws InterruptedException {
         setupTestAccountAndSignInToSync(FOREIGN_SESSION_TEST_MACHINE_ID);
         Account account =