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

This change is motivated by some complex test flakiness issues that were
discovered in http://crrev.com/1118833002. Making it impossible to store
a reference means that if we overwrite it for tests, we know everyone is
then using the overwritten version.

The approach here is to make every public method static and take the
context as an argument, so it can initialize the inner object if
necessary.

This CL is part 1/3 and leaves in deprecated versions of all the methods.
In part 2/3 the downstream uses of AndroidSyncSettings will be changed,
and in part 3/3 the deprecated methods will be removed upstream.

BUG=480604

Review URL: https://codereview.chromium.org/1138013008

Cr-Commit-Position: refs/heads/master@{#330570}

chrome/android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java

@@ -630,7 +630,7 @@ public class ChromeBrowserProvider extends ContentProvider {
         // Don't allow going up the hierarchy if sync is disabled and the requested node
         // is the Mobile Bookmarks folder.
         if (getParent && nodeId == getMobileBookmarksFolderId()
-                && !AndroidSyncSettings.get(getContext()).isSyncEnabled()) {
+                && !AndroidSyncSettings.isSyncEnabled(getContext())) {
             getParent = false;
         }
 

chrome/android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java

@@ -104,7 +104,7 @@ public class InvalidationController implements ApplicationStatus.ApplicationStat
 
     @Override
     public void onApplicationStateChange(int newState) {
-        if (AndroidSyncSettings.get(mContext).isSyncEnabled()) {
+        if (AndroidSyncSettings.isSyncEnabled(mContext)) {
             if (newState == ApplicationState.HAS_RUNNING_ACTIVITIES) {
                 start();
             } else if (newState == ApplicationState.HAS_PAUSED_ACTIVITIES) {

chrome/android/java/src/org/chromium/chrome/browser/signin/AccountManagementFragment.java

@@ -393,7 +393,7 @@ public class AccountManagementFragment extends PreferenceFragment
                                 ProfileAccountManagementMetrics.CLICK_PRIMARY_ACCOUNT,
                                 mGaiaServiceType);
 
-                        if (AndroidSyncSettings.get(activity).isMasterSyncEnabled()) {
+                        if (AndroidSyncSettings.isMasterSyncEnabled(activity)) {
                             AccountManagementFragmentDelegate delegate = getDelegate();
                             // The delegate is set as part of deferred startup, so it might be null.
                             if (delegate == null) return false;
@@ -480,7 +480,6 @@ public class AccountManagementFragment extends PreferenceFragment
     private static String getSyncStatusSummary(Activity activity) {
         if (!ChromeSigninController.get(activity).isSignedIn()) return "";
 
-        AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(activity);
         ProfileSyncService profileSyncService = ProfileSyncService.get(activity);
         Resources res = activity.getResources();
 
@@ -488,7 +487,7 @@ public class AccountManagementFragment extends PreferenceFragment
             return res.getString(R.string.kids_account);
         }
 
-        if (!androidSyncSettings.isMasterSyncEnabled()) {
+        if (!AndroidSyncSettings.isMasterSyncEnabled(activity)) {
             return res.getString(R.string.sync_android_master_sync_disabled);
         }
 
@@ -496,7 +495,7 @@ public class AccountManagementFragment extends PreferenceFragment
             return res.getString(profileSyncService.getAuthError().getMessage());
         }
 
-        if (androidSyncSettings.isSyncEnabled()) {
+        if (AndroidSyncSettings.isSyncEnabled(activity)) {
             if (!profileSyncService.isSyncInitialized()) {
                 return res.getString(R.string.sync_setup_progress);
             }
@@ -506,7 +505,7 @@ public class AccountManagementFragment extends PreferenceFragment
             }
         }
 
-        return androidSyncSettings.isSyncEnabled()
+        return AndroidSyncSettings.isSyncEnabled(activity)
                 ? res.getString(R.string.sync_is_enabled)
                 : res.getString(R.string.sync_is_disabled);
     }

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -414,7 +414,7 @@ public class SigninManager {
 
         // Sign-in to sync.
         ProfileSyncService profileSyncService = ProfileSyncService.get(mContext);
-        if (AndroidSyncSettings.get(mContext).isSyncEnabled()
+        if (AndroidSyncSettings.isSyncEnabled(mContext)
                 && !profileSyncService.hasSyncSetupCompleted()) {
             profileSyncService.setSetupInProgress(true);
             profileSyncService.syncSignIn();

chrome/android/java/src/org/chromium/chrome/browser/sync/DelayedSyncController.java

@@ -63,8 +63,7 @@ public class DelayedSyncController {
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... unused) {
-                String contractAuthority =
-                        AndroidSyncSettings.get(context).getContractAuthority();
+                String contractAuthority = AndroidSyncSettings.getContractAuthority(context);
                 ContentResolver.requestSync(account, contractAuthority, new Bundle());
                 return null;
             }

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncController.java

@@ -63,7 +63,6 @@ public class SyncController implements ApplicationStateListener,
 
     private final Context mContext;
     private final ChromeSigninController mChromeSigninController;
-    private final AndroidSyncSettings mAndroidSyncSettings;
     private final ProfileSyncService mProfileSyncService;
     private final SyncNotificationController mSyncNotificationController;
 
@@ -77,8 +76,7 @@ public class SyncController implements ApplicationStateListener,
     private SyncController(Context context) {
         mContext = context;
         mChromeSigninController = ChromeSigninController.get(mContext);
-        mAndroidSyncSettings = AndroidSyncSettings.get(context);
-        mAndroidSyncSettings.registerObserver(this);
+        AndroidSyncSettings.registerObserver(context, this);
         mProfileSyncService = ProfileSyncService.get(mContext);
         mProfileSyncService.addSyncStateChangedListener(this);
 
@@ -149,7 +147,7 @@ public class SyncController implements ApplicationStateListener,
      * Updates sync to reflect the state of the Android sync settings.
      */
     public void updateSyncStateFromAndroid() {
-        if (mAndroidSyncSettings.isSyncEnabled()) {
+        if (AndroidSyncSettings.isSyncEnabled(mContext)) {
             start();
         } else {
             stop();
@@ -163,11 +161,11 @@ public class SyncController implements ApplicationStateListener,
      */
     public void start() {
         ThreadUtils.assertOnUiThread();
-        if (mAndroidSyncSettings.isMasterSyncEnabled()) {
+        if (AndroidSyncSettings.isMasterSyncEnabled(mContext)) {
             Log.d(TAG, "Enabling sync");
             InvalidationController.get(mContext).start();
             mProfileSyncService.enableSync();
-            mAndroidSyncSettings.enableChromeSync();
+            AndroidSyncSettings.enableChromeSync(mContext);
         }
     }
 
@@ -182,11 +180,11 @@ public class SyncController implements ApplicationStateListener,
             Log.d(TAG, "Disabling sync");
             InvalidationController.get(mContext).stop();
             mProfileSyncService.disableSync();
-            if (mAndroidSyncSettings.isMasterSyncEnabled()) {
+            if (AndroidSyncSettings.isMasterSyncEnabled(mContext)) {
                 // Only disable Android's Chrome sync setting if we weren't disabled
                 // by the master sync setting. This way, when master sync is enabled
                 // they will both be on and sync will start again.
-                mAndroidSyncSettings.disableChromeSync();
+                AndroidSyncSettings.disableChromeSync(mContext);
             }
         }
     }
@@ -204,12 +202,12 @@ public class SyncController implements ApplicationStateListener,
         // Make the Java state match the native state.
         if (isSyncActive) {
             InvalidationController.get(mContext).start();
-            mAndroidSyncSettings.enableChromeSync();
+            AndroidSyncSettings.enableChromeSync(mContext);
         } else {
             InvalidationController.get(mContext).stop();
-            if (mAndroidSyncSettings.isMasterSyncEnabled()) {
+            if (AndroidSyncSettings.isMasterSyncEnabled(mContext)) {
                 // See comment in stop().
-                mAndroidSyncSettings.disableChromeSync();
+                AndroidSyncSettings.disableChromeSync(mContext);
             }
         }
     }
@@ -263,7 +261,7 @@ public class SyncController implements ApplicationStateListener,
     }
 
     private void onFirstStart() {
-        if (mAndroidSyncSettings.isSyncEnabled()) {
+        if (AndroidSyncSettings.isSyncEnabled(mContext)) {
             InvalidationController controller = InvalidationController.get(mContext);
             controller.refreshRegisteredTypes(mProfileSyncService.getPreferredDataTypes());
         }

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

@@ -27,7 +27,6 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
     private static final String TAG = "SyncNotificationController";
     private final Context mApplicationContext;
     private final GoogleServicesNotificationController mNotificationController;
-    private final AndroidSyncSettings mAndroidSyncSettings;
     private final Class<? extends Activity> mPassphraseRequestActivity;
     private final Class<? extends Fragment> mAccountManagementFragment;
     private final ProfileSyncService mProfileSyncService;
@@ -38,7 +37,6 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
         mApplicationContext = context.getApplicationContext();
         mNotificationController = GoogleServicesNotificationController.get(context);
         mProfileSyncService = ProfileSyncService.get(context);
-        mAndroidSyncSettings = AndroidSyncSettings.get(context);
         mPassphraseRequestActivity = passphraseRequestActivity;
         mAccountManagementFragment = accountManagementFragment;
     }
@@ -62,7 +60,7 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
         Intent intent;
 
         // Auth errors take precedence over passphrase errors.
-        if (!mAndroidSyncSettings.isSyncEnabled()) {
+        if (!AndroidSyncSettings.isSyncEnabled(mApplicationContext)) {
             mNotificationController.cancelNotification(NotificationConstants.NOTIFICATION_ID_SYNC);
             return;
         }

chrome/android/java/src/org/chromium/chrome/browser/sync/ui/SyncCustomizationFragment.java

@@ -89,7 +89,6 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
     private static final int ERROR_COLOR = Color.RED;
 
     private ChromeSwitchPreference mSyncSwitchPreference;
-    private AndroidSyncSettings mAndroidSyncSettings;
     private boolean mIsSyncInitialized;
 
     @VisibleForTesting
@@ -120,7 +119,6 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        mAndroidSyncSettings = AndroidSyncSettings.get(getActivity());
         mProfileSyncService = ProfileSyncService.get(getActivity());
         mIsSyncInitialized = mProfileSyncService.isSyncInitialized();
 
@@ -242,7 +240,8 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
         if (!getActivity().isChangingConfigurations()) {
             // Only save state if the switch and external state match. If a stop and clear comes
             // while the dialog is open, this will be false and settings won't be saved.
-            if (mSyncSwitchPreference.isChecked() && mAndroidSyncSettings.isSyncEnabled()) {
+            if (mSyncSwitchPreference.isChecked()
+                    && AndroidSyncSettings.isSyncEnabled(getActivity())) {
                 // Save the new data type state.
                 configureSyncDataTypes();
                 // Inform sync that the user has finished setting up sync at least once.
@@ -260,7 +259,7 @@ public class SyncCustomizationFragment extends PreferenceFragment implements
      * updateSyncStateFromSwitch, which uses that as its source of truth.
      */
     private void updateSyncState() {
-        boolean isSyncEnabled = mAndroidSyncSettings.isSyncEnabled();
+        boolean isSyncEnabled = AndroidSyncSettings.isSyncEnabled(getActivity());
         mSyncSwitchPreference.setChecked(isSyncEnabled);
         mSyncSwitchPreference.setEnabled(canDisableSync());
         updateSyncStateFromSwitch();

chrome/android/javatests_shell/src/org/chromium/chrome/browser/invalidation/InvalidationControllerTest.java

@@ -117,11 +117,10 @@ public class InvalidationControllerTest extends InstrumentationTestCase {
         Account account = AccountManagerHelper.createAccountFromName("test@gmail.com");
         ChromeSigninController chromeSigninController = ChromeSigninController.get(mContext);
         chromeSigninController.setSignedInAccountName(account.name);
-        AndroidSyncSettings androidSyncSettings = AndroidSyncSettings.get(mContext);
         if (syncEnabled) {
-            androidSyncSettings.enableChromeSync();
+            AndroidSyncSettings.enableChromeSync(mContext);
         } else {
-            androidSyncSettings.disableChromeSync();
+            AndroidSyncSettings.disableChromeSync(mContext);
         }
     }
 

chrome/android/javatests_shell/src/org/chromium/chrome/browser/sync/ChromiumSyncAdapterTest.java

@@ -72,7 +72,7 @@ public class ChromiumSyncAdapterTest extends ChromeShellTestBase {
 
     public void performSyncWithBundle(Bundle bundle) {
         mSyncAdapter.onPerformSync(TEST_ACCOUNT, bundle,
-                AndroidSyncSettings.get(getActivity()).getContractAuthority(),
+                AndroidSyncSettings.getContractAuthority(getActivity()),
                 null, new SyncResult());
     }
 

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));
     }
 
     /**

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

@@ -152,7 +152,7 @@ public class SyncTest extends SyncTestBase {
 
         Account account =
                 AccountManagerHelper.createAccountFromName(SyncTestUtil.DEFAULT_TEST_ACCOUNT);
-        String authority = AndroidSyncSettings.get(mContext).getContractAuthority();
+        String authority = AndroidSyncSettings.getContractAuthority(mContext);
 
         // Disabling Android sync should turn Chrome sync engine off.
         mSyncContentResolver.setSyncAutomatically(account, authority, false);

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

@@ -60,7 +60,7 @@ public class SyncTestBase extends ChromeShellTestBase {
             public void run() {
                 mSyncController = SyncController.get(mContext);
                 // Ensure SyncController is registered with the new AndroidSyncSettings.
-                AndroidSyncSettings.get(mContext).registerObserver(mSyncController);
+                AndroidSyncSettings.registerObserver(mContext, mSyncController);
                 mFakeServerHelper = FakeServerHelper.get();
             }
         });

components/invalidation/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java

@@ -444,7 +444,7 @@ public class InvalidationClientService extends AndroidListener {
             bundle.putString("payload", (payload == null) ? "" : payload);
         }
         Account account = ChromeSigninController.get(this).getSignedInUser();
-        String contractAuthority = AndroidSyncSettings.get(this).getContractAuthority();
+        String contractAuthority = AndroidSyncSettings.getContractAuthority(this);
         requestSyncFromContentResolver(bundle, account, contractAuthority);
     }
 
@@ -472,7 +472,7 @@ public class InvalidationClientService extends AndroidListener {
     /** Returns whether sync is enabled. LLocal method so it can be overridden in tests. */
     @VisibleForTesting
     boolean isSyncEnabled() {
-        return AndroidSyncSettings.get(getApplicationContext()).isSyncEnabled();
+        return AndroidSyncSettings.isSyncEnabled(getApplicationContext());
     }
 
     /**

sync/android/java/src/org/chromium/sync/AndroidSyncSettings.java

@@ -21,7 +21,9 @@ import javax.annotation.concurrent.ThreadSafe;
  *
  * It also provides an observer to be used whenever Android sync settings change.
  *
- * To retrieve an instance of this class, call AndroidSyncSettings.get(someContext).
+ * This class is a collection of static methods so that no references to its object can be
+ * stored. This is important because tests need to be able to overwrite the object with a
+ * mock content resolver and know that no references to the old one are cached.
  *
  * This class must be initialized via updateAccount() on startup if the user is signed in.
  */
@@ -35,7 +37,7 @@ public class AndroidSyncSettings {
      */
     private static final Object CLASS_LOCK = new Object();
 
-    private static AndroidSyncSettings sAndroidSyncSettings;
+    private static AndroidSyncSettings sInstance;
 
     private final Object mLock = new Object();
 
@@ -63,37 +65,26 @@ public class AndroidSyncSettings {
         public void androidSyncSettingsChanged();
     }
 
-    /**
-     * A factory method for the AndroidSyncSettings.
-     *
-     * It is possible to override the {@link SyncContentResolverDelegate} to use in tests for the
-     * instance of the AndroidSyncSettings by calling overrideForTests(...) with
-     * your {@link SyncContentResolverDelegate}.
-     *
-     * @param context the ApplicationContext is retrieved from the context used as an argument.
-     * @return a singleton instance of the AndroidSyncSettings
-     */
-    public static AndroidSyncSettings get(Context context) {
+    private static void ensureInitialized(Context context) {
         synchronized (CLASS_LOCK) {
-            if (sAndroidSyncSettings == null) {
+            if (sInstance == null) {
                 SyncContentResolverDelegate contentResolver =
                         new SystemSyncContentResolverDelegate();
-                sAndroidSyncSettings = new AndroidSyncSettings(context, contentResolver);
+                sInstance = new AndroidSyncSettings(context, contentResolver);
             }
         }
-        return sAndroidSyncSettings;
     }
 
     @VisibleForTesting
     public static void overrideForTests(Context context,
             SyncContentResolverDelegate contentResolver) {
         synchronized (CLASS_LOCK) {
-            sAndroidSyncSettings = new AndroidSyncSettings(context, contentResolver);
+            sInstance = new AndroidSyncSettings(context, contentResolver);
         }
     }
 
     /**
-     * @param context the context
+     * @param context the context the ApplicationContext will be retrieved from.
      * @param syncContentResolverDelegate an implementation of {@link SyncContentResolverDelegate}.
      */
     private AndroidSyncSettings(Context context,
@@ -117,8 +108,9 @@ public class AndroidSyncSettings {
      *
      * @return true if sync is on, false otherwise
      */
-    public boolean isSyncEnabled() {
-        return mMasterSyncEnabled && mChromeSyncEnabled;
+    public static boolean isSyncEnabled(Context context) {
+        ensureInitialized(context);
+        return sInstance.mMasterSyncEnabled && sInstance.mChromeSyncEnabled;
     }
 
     /**
@@ -129,66 +121,74 @@ public class AndroidSyncSettings {
      *
      * @return true if sync is on, false otherwise
      */
-    public boolean isChromeSyncEnabled() {
-        return mChromeSyncEnabled;
+    public static boolean isChromeSyncEnabled(Context context) {
+        ensureInitialized(context);
+        return sInstance.mChromeSyncEnabled;
     }
 
     /**
      * Checks whether the master sync flag for Android is currently enabled.
      */
-    public boolean isMasterSyncEnabled() {
-        return mMasterSyncEnabled;
+    public static boolean isMasterSyncEnabled(Context context) {
+        ensureInitialized(context);
+        return sInstance.mMasterSyncEnabled;
     }
 
     /**
      * Make sure Chrome is syncable, and enable sync.
      */
-    public void enableChromeSync() {
-        setChromeSyncEnabled(true);
+    public static void enableChromeSync(Context context) {
+        ensureInitialized(context);
+        sInstance.setChromeSyncEnabled(true);
     }
 
     /**
      * Disables Android Chrome sync
      */
-    public void disableChromeSync() {
-        setChromeSyncEnabled(false);
+    public static void disableChromeSync(Context context) {
+        ensureInitialized(context);
+        sInstance.setChromeSyncEnabled(false);
     }
 
     /**
      * Must be called when a new account is signed in.
      */
-    public void updateAccount(Account account) {
-        synchronized (mLock) {
-            mAccount = account;
-            updateSyncability();
+    public static void updateAccount(Context context, Account account) {
+        ensureInitialized(context);
+        synchronized (sInstance.mLock) {
+            sInstance.mAccount = account;
+            sInstance.updateSyncability();
         }
-        if (updateCachedSettings()) {
-            notifyObservers();
+        if (sInstance.updateCachedSettings()) {
+            sInstance.notifyObservers();
         }
     }
 
     /**
      * Returns the contract authority to use when requesting sync.
      */
-    public String getContractAuthority() {
-        return mApplicationContext.getPackageName();
+    public static String getContractAuthority(Context context) {
+        ensureInitialized(context);
+        return sInstance.getContractAuthority();
     }
 
     /**
      * Add a new AndroidSyncSettingsObserver.
      */
-    public void registerObserver(AndroidSyncSettingsObserver observer) {
-        synchronized (mLock) {
-            mObservers.addObserver(observer);
+    public static void registerObserver(Context context, AndroidSyncSettingsObserver observer) {
+        ensureInitialized(context);
+        synchronized (sInstance.mLock) {
+            sInstance.mObservers.addObserver(observer);
         }
     }
 
     /**
      * Remove an AndroidSyncSettingsObserver that was previously added.
      */
-    public void unregisterObserver(AndroidSyncSettingsObserver observer) {
-        synchronized (mLock) {
-            mObservers.removeObserver(observer);
+    public static void unregisterObserver(Context context, AndroidSyncSettingsObserver observer) {
+        ensureInitialized(context);
+        synchronized (sInstance.mLock) {
+            sInstance.mObservers.removeObserver(observer);
         }
     }
 
@@ -290,4 +290,68 @@ public class AndroidSyncSettings {
             observer.androidSyncSettingsChanged();
         }
     }
+
+    // TODO(maxbogue): make private once downstream uses are removed.
+    @Deprecated
+    public String getContractAuthority() {
+        return mApplicationContext.getPackageName();
+    }
+
+    // Deprecated section; to be removed once downstream no longer uses them.
+
+    @Deprecated
+    public static AndroidSyncSettings get(Context context) {
+        ensureInitialized(context);
+        return sInstance;
+    }
+
+    @Deprecated
+    public boolean isSyncEnabled() {
+        return mMasterSyncEnabled && mChromeSyncEnabled;
+    }
+
+    @Deprecated
+    public boolean isChromeSyncEnabled() {
+        return mChromeSyncEnabled;
+    }
+
+    @Deprecated
+    public boolean isMasterSyncEnabled() {
+        return mMasterSyncEnabled;
+    }
+
+    @Deprecated
+    public void enableChromeSync() {
+        setChromeSyncEnabled(true);
+    }
+
+    @Deprecated
+    public void disableChromeSync() {
+        setChromeSyncEnabled(false);
+    }
+
+    @Deprecated
+    public void updateAccount(Account account) {
+        synchronized (mLock) {
+            mAccount = account;
+            updateSyncability();
+        }
+        if (updateCachedSettings()) {
+            notifyObservers();
+        }
+    }
+
+    @Deprecated
+    public void registerObserver(AndroidSyncSettingsObserver observer) {
+        synchronized (mLock) {
+            mObservers.addObserver(observer);
+        }
+    }
+
+    @Deprecated
+    public void unregisterObserver(AndroidSyncSettingsObserver observer) {
+        synchronized (mLock) {
+            mObservers.removeObserver(observer);
+        }
+    }
 }

sync/android/java/src/org/chromium/sync/signin/ChromeSigninController.java

@@ -44,14 +44,11 @@ public class ChromeSigninController {
 
     private final ObserverList<Listener> mListeners = new ObserverList<Listener>();
 
-    private final AndroidSyncSettings mAndroidSyncSettings;
-
     private boolean mGcmInitialized;
 
     private ChromeSigninController(Context context) {
         mApplicationContext = context.getApplicationContext();
-        mAndroidSyncSettings = AndroidSyncSettings.get(context);
-        mAndroidSyncSettings.updateAccount(getSignedInUser());
+        AndroidSyncSettings.updateAccount(context, getSignedInUser());
     }
 
     /**
@@ -86,7 +83,7 @@ public class ChromeSigninController {
                 .putString(SIGNED_IN_ACCOUNT_KEY, accountName)
                 .apply();
         // TODO(maxbogue): Move this to SigninManager.
-        mAndroidSyncSettings.updateAccount(getSignedInUser());
+        AndroidSyncSettings.updateAccount(mApplicationContext, getSignedInUser());
     }
 
     public void clearSignedInUser() {