[Sync] Improve test to use content resolver

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

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
index ef3d3d383e5775cb84c3efc561e8707498b66626..6b429df345bbf46893a6bc62bfe3ccd23b60ac54 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncTestBase.java
@@ -38,6 +38,7 @@ public class SyncTestBase extends ChromeShellTestBase {
     protected SyncController mSyncController;
     protected FakeServerHelper mFakeServerHelper;
     protected ProfileSyncService mProfileSyncService;
+    protected MockSyncContentResolverDelegate mSyncContentResolver;
 
     @Override
     protected void setUp() throws Exception {
@@ -109,10 +110,9 @@ public class SyncTestBase extends ChromeShellTestBase {
     }
 
     private void setUpMockAndroidSyncSettings() {
-        MockSyncContentResolverDelegate syncContentResolverDelegate =
-                new MockSyncContentResolverDelegate();
-        syncContentResolverDelegate.setMasterSyncAutomatically(true);
-        AndroidSyncSettings.overrideForTests(mContext, syncContentResolverDelegate);
+        mSyncContentResolver = new MockSyncContentResolverDelegate();
+        mSyncContentResolver.setMasterSyncAutomatically(true);
+        AndroidSyncSettings.overrideForTests(mContext, mSyncContentResolver);
     }
 
     protected void setupTestAccountAndSignInToSync(