Created the dialog offering the user to merge their account data or keep it

chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
index c9017d3796e1ac966cc9a8fb4dfeca91fa3fb63a..fd7aa125df4ac186de78938e7dad8eeb72978025 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -4,37 +4,25 @@
 
 package org.chromium.chrome.browser.preferences;
 
-import android.app.DialogFragment;
-import android.app.FragmentManager;
-import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceFragment;
 
-import org.chromium.base.Callback;
-import org.chromium.base.VisibleForTesting;
-import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.PasswordUIView;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
 import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPreferences;
-import org.chromium.chrome.browser.signin.AccountAdder;
-import org.chromium.chrome.browser.signin.AddGoogleAccountDialogFragment;
-import org.chromium.chrome.browser.signin.AddGoogleAccountDialogFragment.AddGoogleAccountListener;
-import org.chromium.chrome.browser.signin.SigninAccessPoint;
+import org.chromium.chrome.browser.signin.AccountSigninActivity;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.chrome.browser.signin.SigninManager.SignInStateObserver;
-import org.chromium.chrome.browser.sync.ui.ChooseAccountFragment;
 import org.chromium.chrome.browser.util.FeatureUtilities;
-import org.chromium.sync.signin.AccountManagerHelper;
 import org.chromium.sync.signin.ChromeSigninController;
 
-import java.util.List;
-
 /**
  * The main settings screen, shown when the user first opens Settings.
  */
@@ -98,11 +86,16 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
         mSignInPreference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                if (!ChromeSigninController.get(getActivity()).isSignedIn()) {
-                    displayAccountPicker();
-                    return true;
+                if (ChromeSigninController.get(getActivity()).isSignedIn()) return false;
+                if (!SigninManager.get(getActivity()).isSignInAllowed()) return false;
+
+                if (SigninManager.get(getActivity()).isSigninDisabledByPolicy()) {

[newt (away), 2016/02/25 06:25:53]

this if block should be nested inside the isSignInAllowed() if block above

[PEConn, 2016/02/25 14:19:51]

Done.

+                    ManagedPreferencesUtils.showManagedByAdministratorToast(getActivity());
+                    return false;
                 }
-                return false;
+
+                startActivity(new Intent(getActivity(), AccountSigninActivity.class));
+                return true;
             }
         });
 
@@ -165,80 +158,6 @@ public class MainPreferences extends PreferenceFragment implements SignInStateOb
         }
     }
 
-    private void displayAccountPicker() {
-        displayAccountPicker(new Callback<DialogFragment>() {
-            @Override
-            public void onResult(DialogFragment fragment) {}
-        });
-    }
-
-    /**
-     * Displays the account picker or the add account dialog and signs the user in.
-     *
-     * @param callback Called with the fragment that was shown, or null. Used for testing.
-     */
-    @VisibleForTesting
-    public void displayAccountPicker(final Callback<DialogFragment> callback) {
-        Context context = getActivity();
-        if (context == null) {
-            postCallback(callback, null);
-            return;
-        }
-
-        if (!SigninManager.get(context).isSignInAllowed()) {
-            if (SigninManager.get(context).isSigninDisabledByPolicy()) {
-                ManagedPreferencesUtils.showManagedByAdministratorToast(context);
-            }
-            postCallback(callback, null);
-            return;
-        }
-
-        AccountManagerHelper.get(context).getGoogleAccountNames(new Callback<List<String>>() {
-            @Override
-            public void onResult(List<String> accountNames) {
-                FragmentManager fragmentManager = getFragmentManager();
-                if (fragmentManager == null) {
-                    // Preferences were closed since the click happened; abort.
-                    callback.onResult(null);
-                    return;
-                }
-
-                if (!accountNames.isEmpty()) {
-                    if (fragmentManager.findFragmentByTag(ACCOUNT_PICKER_DIALOG_TAG) != null) {
-                        callback.onResult(null);
-                    } else {
-                        ChooseAccountFragment chooserFragment =
-                                new ChooseAccountFragment(accountNames);
-                        chooserFragment.show(fragmentManager, ACCOUNT_PICKER_DIALOG_TAG);
-                        callback.onResult(chooserFragment);
-                        SigninManager.logSigninStartAccessPoint(SigninAccessPoint.SETTINGS);

[newt (away), 2016/02/25 06:25:53]

Do we still call this somewhere?

[PEConn, 2016/02/25 14:19:51]

It's called when signing in through the Recent Tabs, Signin Promo and the first
run activity.

I put this call back in the OnPreferenceClickListener above.

-                    }
-                } else {
-                    AddGoogleAccountDialogFragment dialog = new AddGoogleAccountDialogFragment();
-                    dialog.setListener(new AddGoogleAccountListener() {
-                        @Override
-                        public void onAddAccountClicked() {
-                            RecordUserAction.record("Signin_AddAccountToDevice");
-                            AccountAdder.getInstance().addAccount(
-                                    MainPreferences.this, AccountAdder.ADD_ACCOUNT_RESULT);
-                        }
-                    });
-                    dialog.show(fragmentManager, null);
-                    callback.onResult(dialog);
-                }
-            }
-        });
-    }
-
-    private <V> void postCallback(final Callback<V> callback, final V result) {
-        new Handler().post(new Runnable() {
-            @Override
-            public void run() {
-                callback.onResult(result);
-            }
-        });
-    }
-
     // SignInStateObserver
 
     @Override