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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
index b72e67253a8347994ba746c247a9b47ba37ea4ed..5b1e2ff69123cf301283aff0b611fbd72dddfef9 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/signin/SigninPromoScreen.java
@@ -14,7 +14,6 @@ import android.widget.LinearLayout;
 
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.firstrun.AccountFirstRunView;
 import org.chromium.chrome.browser.firstrun.ProfileDataCache;
 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
@@ -24,6 +23,9 @@ import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.SigninManager.SignInCallback;
 import org.chromium.chrome.browser.sync.ProfileSyncService;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment.ImportSyncType;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment.Listener;
 import org.chromium.chrome.browser.sync.ui.SyncCustomizationFragment;
 import org.chromium.chrome.browser.widget.AlwaysDismissedDialog;
 import org.chromium.sync.signin.ChromeSigninController;
@@ -32,8 +34,8 @@ import org.chromium.sync.signin.ChromeSigninController;
  * This class implements the dialog UI for the signin promo.
  */
 public class SigninPromoScreen
-        extends AlwaysDismissedDialog implements AccountFirstRunView.Listener {
-    private AccountFirstRunView mAccountFirstRunView;
+        extends AlwaysDismissedDialog implements AccountSigninView.Listener {
+    private AccountSigninView mAccountFirstRunView;
     private ProfileDataCache mProfileDataCache;
     private String mAccountName;
 
@@ -75,9 +77,9 @@ public class SigninPromoScreen
         setOwnerActivity(activity);
 
         LayoutInflater inflater = LayoutInflater.from(activity);
-        View view = inflater.inflate(R.layout.fre_choose_account, null);
+        View view = inflater.inflate(R.layout.account_signin_view, null);
         mProfileDataCache = new ProfileDataCache(activity, Profile.getLastUsedProfile());
-        mAccountFirstRunView = (AccountFirstRunView) view.findViewById(R.id.fre_account_layout);
+        mAccountFirstRunView = (AccountSigninView) view.findViewById(R.id.account_layout);
         mAccountFirstRunView.init(mProfileDataCache);
         mAccountFirstRunView.configureForAddAccountPromo();
         mAccountFirstRunView.setListener(this);
@@ -119,7 +121,7 @@ public class SigninPromoScreen
     public void onDoneClicked() {
         Activity activity = getOwnerActivity();
         RecordUserAction.record("Signin_Signin_FromSigninPromo");
-        SigninManager.get(activity).signIn(mAccountName, activity, new SignInCallback() {
+        SigninManager.get(activity).signIn(mAccountName, null, new SignInCallback() {

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

Why pass null now? Do we ever need "interactive" sign-in via
SigninManager.signIn() now, or can SigninManager be updated?

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

Acknowledged.

             @Override
             public void onSignInComplete() {
                 SigninManager.get(getOwnerActivity()).logInSignedInUser();
@@ -153,4 +155,12 @@ public class SigninPromoScreen
     public void onFailedToSetForcedAccount(String forcedAccountName) {
         assert false : "No forced accounts in SigninPromoScreen";
     }
+
+    @Override
+    public void onPreviousAccountFound(
+            String oldAccountName, String newAccountName, Listener callback) {
+        ConfirmImportSyncDataFragment.showNewInstance(oldAccountName, newAccountName,
+                ImportSyncType.PREVIOUS_DATA_FOUND, getOwnerActivity().getFragmentManager(),
+                callback);
+    }
 }