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

chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
index be16f4c33833c1c12f7decd2ce070f4ef6d0f0f2..8e44f76cf9f186443295457fa16300e333732119 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java
@@ -12,6 +12,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.signin.AccountSigninView;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment;
+import org.chromium.chrome.browser.sync.ui.ConfirmImportSyncDataFragment.Listener;
 
 /**
  * A {@link Fragment} meant to handle sync setup for the first run experience.
@@ -22,13 +25,13 @@ public class AccountFirstRunFragment extends FirstRunPage {
     public static final String PRESELECT_BUT_ALLOW_TO_CHANGE = "PreselectButAllowToChange";
     public static final String IS_CHILD_ACCOUNT = "IsChildAccount";
 
-    private AccountFirstRunView mView;
+    private AccountSigninView mView;
 
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        mView = (AccountFirstRunView) inflater.inflate(
-                R.layout.fre_choose_account, container, false);
+        mView = (AccountSigninView) inflater.inflate(
+                R.layout.account_signin_view, container, false);
         return mView;
     }
 
@@ -36,7 +39,7 @@ public class AccountFirstRunFragment extends FirstRunPage {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mView.setListener(new AccountFirstRunView.Listener() {
+        mView.setListener(new AccountSigninView.Listener() {
             @Override
             public void onAccountSelectionCanceled() {
                 getPageDelegate().refuseSignIn();
@@ -71,6 +74,12 @@ public class AccountFirstRunFragment extends FirstRunPage {
                 getPageDelegate().abortFirstRunExperience();
             }
 
+            @Override
+            public void onPreviousAccountFound(
+                    String oldAccountName, String newAccountName, Listener callback) {
+                ConfirmImportSyncDataFragment.showNewInstance(
+                        oldAccountName, newAccountName, getFragmentManager(), callback);
+            }
         });
 
         mView.init(getPageDelegate().getProfileDataCache());