[Sync] Improve test to use content resolver

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

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
index 56a8f32f998f9d4e666f7eb4eb64ad881bcd8fac..b0ec1488982862cc5dfe404fe9d9ca619747a178 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTest.java
@@ -130,17 +130,20 @@ public class SyncTest extends SyncTestBase {
 
     @LargeTest
     @Feature({"Sync"})
-    public void testDisableAndEnableSync() throws InterruptedException {
+    public void testDisableAndEnableSyncThroughAndroid() throws InterruptedException {
         setupTestAccountAndSignInToSync(CLIENT_ID);
+        SyncTestUtil.ensureSyncInitialized(mContext);
+
         Account account =
                 AccountManagerHelper.createAccountFromName(SyncTestUtil.DEFAULT_TEST_ACCOUNT);
+        String authority = AndroidSyncSettings.get(mContext).getContractAuthority();
 
         // Disabling Android sync should turn Chrome sync engine off.
-        AndroidSyncSettings.get(mContext).disableChromeSync();
+        mSyncContentResolver.setSyncAutomatically(account, authority, false);
         SyncTestUtil.verifySyncIsDisabled(mContext, account);
 
         // Enabling Android sync should turn Chrome sync engine on.
-        AndroidSyncSettings.get(mContext).enableChromeSync();
+        mSyncContentResolver.setSyncAutomatically(account, authority, true);
         SyncTestUtil.ensureSyncInitialized(mContext);
         SyncTestUtil.verifySignedInWithAccount(mContext, account);
     }