Rewrite AndroidSyncSettings to be significantly simpler.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.util.Log;
@@ skipping 102 matching lines @@
 
     /**
      * Starts sync if the master sync flag is enabled.
      *
      * Affects native sync, the invalidation controller, and the Android sync settings.
      */
     public void start() {
         ThreadUtils.assertOnUiThread();
         if (mAndroidSyncSettings.isMasterSyncEnabled()) {
             Log.d(TAG, "Enabling sync");
-            Account account = mChromeSigninController.getSignedInUser();
             InvalidationController.get(mContext).start();
             mProfileSyncService.enableSync();
-            mAndroidSyncSettings.enableChromeSync(account);
+            mAndroidSyncSettings.enableChromeSync();
         }
     }
 
     /**
      * Stops Sync if a user is currently signed in.
      *
      * Affects native sync, the invalidation controller, and the Android sync settings.
      */
     public void stop() {
         ThreadUtils.assertOnUiThread();
         if (mChromeSigninController.isSignedIn()) {
             Log.d(TAG, "Disabling sync");
-            Account account = mChromeSigninController.getSignedInUser();
             InvalidationController.get(mContext).stop();
             mProfileSyncService.disableSync();
             if (mAndroidSyncSettings.isMasterSyncEnabled()) {
                 // 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(account);
+                mAndroidSyncSettings.disableChromeSync();
             }
         }
     }
 
     /**
      * From {@link ProfileSyncService.SyncStateChangedListener}.
      *
      * Changes the invalidation controller and Android sync setting state to match
      * the new native sync state.
      */
     @Override
     public void syncStateChanged() {
         ThreadUtils.assertOnUiThread();
-        Account account = mChromeSigninController.getSignedInUser();
-        // Don't do anything if there isn't an account.
-        if (account == null) return;
         boolean isSyncActive = !mProfileSyncService.isStartSuppressed();
         // Make the Java state match the native state.
         if (isSyncActive) {
             InvalidationController.get(mContext).start();
-            mAndroidSyncSettings.enableChromeSync(account);
+            mAndroidSyncSettings.enableChromeSync();
         } else {
             InvalidationController.get(mContext).stop();
             if (mAndroidSyncSettings.isMasterSyncEnabled()) {
                 // See comment in stop().
-                mAndroidSyncSettings.disableChromeSync(account);
+                mAndroidSyncSettings.disableChromeSync();
             }
         }
     }
 
     /**
      * From {@link AndroidSyncSettings.AndroidSyncSettingsObserver}.
      */
     @Override
     public void androidSyncSettingsChanged() {
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 updateSyncStateFromAndroid();
             }
         });
     }
 }