Rewrite AndroidSyncSettings to be significantly simpler.

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

 // Copyright 2013 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.signin;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ skipping 353 matching lines @@
         // Tell the native side that sign-in has completed.
         nativeOnSignInCompleted(mNativeSigninManagerAndroid, mSignInAccount.name,
                                 accountIdsAndNames.mAccountIds, accountIdsAndNames.mAccountNames);
 
         // Register for invalidations.
         InvalidationController invalidationController = InvalidationController.get(mContext);
         invalidationController.setRegisteredTypes(mSignInAccount, true, new HashSet<ModelType>());
 
         // Sign-in to sync.
         ProfileSyncService profileSyncService = ProfileSyncService.get(mContext);
-        if (AndroidSyncSettings.get(mContext).isSyncEnabled(mSignInAccount)
+        if (AndroidSyncSettings.get(mContext).isSyncEnabled()
                 && !profileSyncService.hasSyncSetupCompleted()) {
             profileSyncService.setSetupInProgress(true);
             profileSyncService.syncSignIn();
         }
 
         if (mSignInFlowObserver != null)
             mSignInFlowObserver.onSigninComplete();
 
         // All done, cleanup.
         Log.d(TAG, "Signin done");
@@ skipping 161 matching lines @@
     private native void nativeOnSignInCompleted(long nativeSigninManagerAndroid, String username,
                                                 String[] accountIds, String[] accountNames);
     private native void nativeSignOut(long nativeSigninManagerAndroid);
     private native String nativeGetManagementDomain(long nativeSigninManagerAndroid);
     private native void nativeWipeProfileData(long nativeSigninManagerAndroid);
     private native void nativeClearLastSignedInUser(long nativeSigninManagerAndroid);
     private native void nativeLogInSignedInUser(long nativeSigninManagerAndroid);
     private native boolean nativeIsSignedInOnNative(long nativeSigninManagerAndroid);
     private static native boolean nativeIsNewProfileManagementEnabled();
 }