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

chrome/android/java/res/layout/account_signin_view.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2015 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.
 -->
-<org.chromium.chrome.browser.firstrun.AccountFirstRunView
+<org.chromium.chrome.browser.signin.AccountSigninView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:chrome="http://schemas.android.com/apk/res-auto"
     android:id="@+id/fre_account_layout"

[Yusuf, 2016/02/18 19:16:16]

let's get rid of the fre mentions in other places as well if we are going to
rename this.

[PEConn, 2016/02/19 18:10:10]

Done.

     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="76dp"
         android:fillViewport="true"
         android:scrollbarStyle="outsideOverlay" >
 
@@ skipping 122 matching lines @@
             chrome:buttonColor="@color/light_active_color" />
 
         <View
             android:id="@+id/positive_button_end_padding"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1"
             android:visibility="gone"/>
     </LinearLayout>
 
-</org.chromium.chrome.browser.firstrun.AccountFirstRunView>
+</org.chromium.chrome.browser.signin.AccountSigninView>