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..0b719359ac7a3814a12def8f847496399c32036a 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;
@@ -32,8 +31,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 +74,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.fre_account_layout);
         mAccountFirstRunView.init(mProfileDataCache);
         mAccountFirstRunView.configureForAddAccountPromo();
         mAccountFirstRunView.setListener(this);