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

chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
index 352e9e565855c82f651c382e64cacd9bf7308586..f84cdee70707620788a87e4223c67a72b266a88e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java
@@ -8,7 +8,6 @@
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.app.Activity;
-import android.app.FragmentManager;
 import android.graphics.Color;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -17,9 +16,9 @@
 import android.widget.TextView;
 
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.firstrun.AccountFirstRunView;
 import org.chromium.chrome.browser.firstrun.ProfileDataCache;
 import org.chromium.chrome.browser.signin.AccountAdder;
-import org.chromium.chrome.browser.signin.AccountSigninView;
 import org.chromium.chrome.browser.signin.SigninManager;
 import org.chromium.sync.AndroidSyncSettings.AndroidSyncSettingsObserver;
 
@@ -177,7 +176,7 @@
         }
 
         if (animate && mPromoType == PROMO_TYPE_SIGN_IN) {
-            ((AccountSigninView) mPromo).switchToSignedMode();
+            ((AccountFirstRunView) mPromo).switchToSignedMode();
         }
 
         final View oldPromo = mPromo;
@@ -250,13 +249,13 @@
     }
 
     private View createSignInPromoView() {
-        AccountSigninView signInPromoView = (AccountSigninView) LayoutInflater.from(getContext())
-                .inflate(R.layout.account_signin_view, this, false);
+        AccountFirstRunView signInPromoView = (AccountFirstRunView)
+                LayoutInflater.from(getContext()).inflate(R.layout.fre_choose_account, this, false);
         signInPromoView.init(mModel.getProfileDataCache());
         signInPromoView.getLayoutParams().height = LayoutParams.WRAP_CONTENT;
         ((FrameLayout.LayoutParams) signInPromoView.getLayoutParams()).gravity = Gravity.CENTER;
         signInPromoView.configureForRecentTabsOrBookmarksPage();
-        signInPromoView.setListener(new AccountSigninView.Listener() {
+        signInPromoView.setListener(new AccountFirstRunView.Listener() {
             private String mAccountName;
 
             @Override
@@ -294,12 +293,6 @@
                 assert false : "No forced accounts in SignInPromoView";
             }
         });
-        signInPromoView.setDelegate(new AccountSigninView.Delegate() {
-            @Override
-            public FragmentManager getFragmentManager() {
-                return mActivity.getFragmentManager();
-            }
-        });
         SigninManager.logSigninStartAccessPoint(mModel.getAccessPoint());
         return signInPromoView;
     }