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

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

Index: chrome/android/java/res/layout/account_signin_view.xml
diff --git a/chrome/android/java/res/layout/fre_choose_account.xml b/chrome/android/java/res/layout/account_signin_view.xml
similarity index 88%
rename from chrome/android/java/res/layout/fre_choose_account.xml
rename to chrome/android/java/res/layout/account_signin_view.xml
index b6bccdda1e505fc73155f69774b70d0a07912033..578ea8a947d63c48d9adcf94a6006b7009dec776 100644
--- a/chrome/android/java/res/layout/fre_choose_account.xml
+++ b/chrome/android/java/res/layout/account_signin_view.xml
@@ -4,10 +4,10 @@
      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"
+    android:id="@+id/account_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
@@ -19,7 +19,7 @@
         android:scrollbarStyle="outsideOverlay" >
 
         <LinearLayout
-            android:id="@+id/fre_account_linear_layout"
+            android:id="@+id/account_linear_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -32,12 +32,12 @@
                 android:layout_marginTop="@dimen/fre_margin"
                 android:gravity="center"
                 android:lineSpacingMultiplier="1.4"
-                android:text="@string/fre_set_up_chrome"
+                android:text="@string/signin_set_up_chrome"
                 android:textColor="@color/fre_title_color"
                 android:textSize="@dimen/fre_title_text_size" />
 
             <LinearLayout
-                android:id="@+id/fre_content"
+                android:id="@+id/content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/fre_margin"
@@ -46,8 +46,8 @@
 
                 <org.chromium.chrome.browser.firstrun.ImageCarousel
                     android:id="@+id/image_slider"
-                    android:layout_width="@dimen/fre_image_carousel_width"
-                    android:layout_height="@dimen/fre_image_carousel_height"
+                    android:layout_width="@dimen/signin_image_carousel_width"
+                    android:layout_height="@dimen/fre_image_height"
                     android:layout_marginBottom="@dimen/fre_margin"/>
 
                 <LinearLayout
@@ -79,8 +79,8 @@
                             android:layout_height="wrap_content"
                             android:gravity="center_horizontal"
                             android:lineSpacingMultiplier="1.4"
-                            android:text="@string/fre_account_choice_description"
-                            android:textColor="@color/fre_light_text_color"
+                            android:text="@string/signin_account_choice_description"
+                            android:textColor="@color/signin_light_text_color"
                             android:textSize="@dimen/fre_normal_text_size"
                             android:visibility="visible"/>
                             
@@ -95,7 +95,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:lineSpacingMultiplier="1.4"
-                            android:textColor="@color/fre_light_text_color"
+                            android:textColor="@color/signin_light_text_color"
                             android:textSize="@dimen/fre_normal_text_size"
                             android:visibility="invisible"/>
 
@@ -120,7 +120,7 @@
             style="@style/ButtonCompatBorderless"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/fre_skip_text"
+            android:text="@string/no_thanks"
             android:textAllCaps="true"
             android:textColor="@color/light_normal_color"
             android:textSize="15sp" />
@@ -150,4 +150,4 @@
             android:visibility="gone"/>
     </LinearLayout>
 
-</org.chromium.chrome.browser.firstrun.AccountFirstRunView>
+</org.chromium.chrome.browser.signin.AccountSigninView>