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

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.DialogFragment;
 import android.content.Context;
@@ skipping 200 matching lines @@
     /**
     * Log the access point when the user see the view of choosing account to sign in.
     * @param accessPoint the enum value of AccessPoint defined in signin_metrics.h.
     */
     public static void logSigninStartAccessPoint(int accessPoint) {
         RecordHistogram.recordEnumeratedHistogram(
                 "Signin.SigninStartedAccessPoint", accessPoint, SigninAccessPoint.MAX);
         sSignInAccessPoint = accessPoint;
     }
 
+    /**
+     * Checks whether a different account was previously signed in and so the confirm data sync
+     * dialog should be shown.
+     * @param newAccountName The name of the proposed account.
+     * @return Whether the previous account was different to the proposed account.
+     */
+    public static boolean shouldShowDataSyncDialog(String newAccountName) {

[newt (away), 2016/02/25 18:01:32]

Now that this the SigninInvestigator logic has been otherwise removed from
SigninManager, you could just inline this code in AccountFirstRunView.

[PEConn, 2016/02/25 20:45:12]

Done.

+        return SigninInvestigator.investigate(newAccountName)
+                == InvestigatedScenario.DIFFERENT_ACCOUNT;
+    }
+
     private void logSigninCompleteAccessPoint() {
         RecordHistogram.recordEnumeratedHistogram(
                 "Signin.SigninCompletedAccessPoint", sSignInAccessPoint, SigninAccessPoint.MAX);
         sSignInAccessPoint = SigninAccessPoint.UNKNOWN;
     }
 
     /**
      * Notifies the SigninManager that the First Run check has completed.
      *
      * The user will be allowed to sign-in once this is signaled.
@@ skipping 54 matching lines @@
         });
     }
 
     /**
     * Continue pending sign in after system accounts have been seeded into AccountTrackerService.
     */
     @Override
     public void onSystemAccountsSeedingComplete() {
         if (mSignInState != null && mSignInState.blockedOnAccountSeeding) {
             mSignInState.blockedOnAccountSeeding = false;
-            progressSignInFlowInvestigateScenario();
+            progressSignInFlowCheckPolicy();
         }
     }
 
     /**
     * Clear pending sign in when system accounts in AccountTrackerService were refreshed.
     */
     @Override
     public void onSystemAccountsChanged() {
         if (mSignInState != null) {
             abortSignIn();
@@ skipping 53 matching lines @@
         AccountManagerHelper.get(mContext).getAccountFromName(accountName, new Callback<Account>() {
             @Override
             public void onResult(Account account) {
                 signIn(account, activity, callback);
             }
         });
     }
 
     private void progressSignInFlowSeedSystemAccounts() {
         if (AccountTrackerService.get(mContext).checkAndSeedSystemAccounts()) {
-            progressSignInFlowInvestigateScenario();
+            progressSignInFlowCheckPolicy();
         } else if (AccountIdProvider.getInstance().canBeUsed(mContext)) {
             mSignInState.blockedOnAccountSeeding = true;
         } else {
             Activity activity = mSignInState.activity;
             UserRecoverableErrorHandler errorHandler = activity != null
                     ? new UserRecoverableErrorHandler.ModalDialog(activity)
                     : new UserRecoverableErrorHandler.SystemNotification();
             ExternalAuthUtils.getInstance().canUseGooglePlayServices(mContext, errorHandler);
             Log.w(TAG, "Cancelling the sign-in process as Google Play services is unavailable");
             abortSignIn();
         }
     }
 
     /**
-     * If sign-in is interactive and the user is changing accounts, display a confirmation dialog.
+     * Continues the signin flow by checking if there is a policy that the account is subject to.
      */
-    private void progressSignInFlowInvestigateScenario() {
-        if (!mSignInState.isInteractive()) {
-            progressSignInFlowCheckPolicy();
+    private void progressSignInFlowCheckPolicy() {
+        if (mSignInState == null) {
+            Log.w(TAG, "Ignoring sign in progress request as no pending sign in.");
             return;
         }
 
         if (mSignInState.isActivityDestroyed()) {
             abortSignIn();
             return;
         }
 
-        // TODO(skym): Warn for high risk upgrade scenario, crbug.com/572754.
-        if (SigninInvestigator.investigate(mSignInState.account.name)
-                == InvestigatedScenario.DIFFERENT_ACCOUNT) {
-            mSignInState.displayedDialog =
-                    ConfirmAccountChangeFragment.newInstance(mSignInState.account.name);
-            mSignInState.displayedDialog.show(
-                    mSignInState.activity.getFragmentManager(), CONFIRM_ACCOUNT_CHANGED_DIALOG_TAG);
-        } else {
-            // Do not display dialog, just sign-in.
-            progressSignInFlowCheckPolicy();
-        }
-    }
-
-    /**
-     * Called from ConfirmAccountChangeFragment if the new account name was confirmed.
-     */
-    void progressInteractiveSignInFlowAccountConfirmed() {
-        if (mSignInState == null || mSignInState.displayedDialog == null) {
-            // Stop if sign-in was cancelled or this is a duplicate click event.
-            return;
-        }
-        mSignInState.displayedDialog = null;
-
-        progressSignInFlowCheckPolicy();
-    }
-
-    /**
-     * Continues the signin flow by checking if there is a policy that the account is subject to.
-     */
-    private void progressSignInFlowCheckPolicy() {
-        if (mSignInState == null) {
-            Log.w(TAG, "Ignoring sign in progress request as no pending sign in.");
-            return;
-        }
-
         if (!nativeShouldLoadPolicyForUser(mSignInState.account.name)) {
             // Proceed with the sign-in flow without checking for policy if it can be determined
             // that this account can't have management enabled based on the username.
             finishSignIn();
             return;
         }
 
         Log.d(TAG, "Checking if account has policy management enabled");
         // This will call back to onPolicyCheckedBeforeSignIn.
         nativeCheckPolicyBeforeSignIn(mNativeSigninManagerAndroid, mSignInState.account.name);
@@ skipping 16 matching lines @@
             return;
         }
 
         if (!mSignInState.isInteractive()) {
             // If this is a forced sign-in then don't show the confirmation dialog.
             // This will call back to onPolicyFetchedBeforeSignIn.
             nativeFetchPolicyBeforeSignIn(mNativeSigninManagerAndroid);
             return;
         }
 
+        // TODO(peconn): Move this and other UI interactions into AccountSigninView.
         Log.d(TAG, "Account has policy management");
         mSignInState.displayedDialog = ConfirmManagedSigninFragment.newInstance(managementDomain);
         mSignInState.displayedDialog.show(
                 mSignInState.activity.getFragmentManager(), CONFIRM_MANAGED_SIGNIN_DIALOG_TAG);
     }
 
     /**
      * Called from ConfirmManagedSigninFragment if the managed account was confirmed.
      */
     void progressInteractiveSignInFlowManagedConfirmed() {
@@ skipping 195 matching lines @@
             long nativeSigninManagerAndroid, String username);
     private native void nativeFetchPolicyBeforeSignIn(long nativeSigninManagerAndroid);
     private native void nativeOnSignInCompleted(long nativeSigninManagerAndroid, String username);
     private native void nativeSignOut(long nativeSigninManagerAndroid);
     private native String nativeGetManagementDomain(long nativeSigninManagerAndroid);
     private native void nativeWipeProfileData(long nativeSigninManagerAndroid, WipeDataHooks hooks);
     private native void nativeClearLastSignedInUser(long nativeSigninManagerAndroid);
     private native void nativeLogInSignedInUser(long nativeSigninManagerAndroid);
     private native boolean nativeIsSignedInOnNative(long nativeSigninManagerAndroid);
 }