[Sync] Make it impossible to get a reference to AndroidSyncSettings.

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

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
index 496f87d24e6ddb7a706741b54e47be09f02f303d..3de18b5e306309b2288152ff51e3108aec896f75 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/SyncCustomizationFragmentTest.java
@@ -54,12 +54,10 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
     }
 
     private Activity mActivity;
-    private AndroidSyncSettings mAndroidSyncSettings;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mAndroidSyncSettings = AndroidSyncSettings.get(mContext);
         mActivity = getActivity();
     }
 
@@ -72,13 +70,13 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
         final SwitchPreference syncSwitch = getSyncSwitch(fragment);
 
         assertTrue(syncSwitch.isChecked());
-        assertTrue(mAndroidSyncSettings.isChromeSyncEnabled());
+        assertTrue(AndroidSyncSettings.isChromeSyncEnabled(mContext));
         togglePreference(syncSwitch);
         assertFalse(syncSwitch.isChecked());
-        assertFalse(mAndroidSyncSettings.isChromeSyncEnabled());
+        assertFalse(AndroidSyncSettings.isChromeSyncEnabled(mContext));
         togglePreference(syncSwitch);
         assertTrue(syncSwitch.isChecked());
-        assertTrue(mAndroidSyncSettings.isChromeSyncEnabled());
+        assertTrue(AndroidSyncSettings.isChromeSyncEnabled(mContext));
     }
 
     /**
@@ -91,7 +89,7 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
         stopSync();
         SyncCustomizationFragment fragment = startSyncCustomizationFragment();
         closeFragment(fragment);
-        assertFalse(mAndroidSyncSettings.isChromeSyncEnabled());
+        assertFalse(AndroidSyncSettings.isChromeSyncEnabled(mContext));
     }
 
     @SmallTest
@@ -139,7 +137,7 @@ public class SyncCustomizationFragmentTest extends SyncTestBase {
         }
         getInstrumentation().waitForIdleSync();
         assertDefaultSyncOffState(fragment);
-        assertFalse(mAndroidSyncSettings.isChromeSyncEnabled());
+        assertFalse(AndroidSyncSettings.isChromeSyncEnabled(mContext));
     }
 
     /**