Revert of 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/account_signin_view.xml b/chrome/android/java/res/layout/account_signin_view.xml
deleted file mode 100644
index 578ea8a947d63c48d9adcf94a6006b7009dec776..0000000000000000000000000000000000000000
--- a/chrome/android/java/res/layout/account_signin_view.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<?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.signin.AccountSigninView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:chrome="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/account_layout"
-    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" >
-
-        <LinearLayout
-            android:id="@+id/account_linear_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/fre_margin"
-                android:gravity="center"
-                android:lineSpacingMultiplier="1.4"
-                android:text="@string/signin_set_up_chrome"
-                android:textColor="@color/fre_title_color"
-                android:textSize="@dimen/fre_title_text_size" />
-
-            <LinearLayout
-                android:id="@+id/content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/fre_margin"
-                android:gravity="center_horizontal"
-                android:orientation="vertical" >
-
-                <org.chromium.chrome.browser.firstrun.ImageCarousel
-                    android:id="@+id/image_slider"
-                    android:layout_width="@dimen/signin_image_carousel_width"
-                    android:layout_height="@dimen/fre_image_height"
-                    android:layout_marginBottom="@dimen/fre_margin"/>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/fre_margin"
-                    android:orientation="vertical"
-                    android:gravity="center_horizontal"
-                    android:paddingEnd="24dp"
-                    android:paddingStart="24dp" >
-
-                    <Spinner
-                        style="@style/Widget.AppCompat.Spinner.Underlined"
-                        android:id="@+id/google_accounts_spinner"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/fre_margin"
-                        android:padding="0dp"
-                        android:textColor="@color/fre_text_color" />
-
-
-                    <FrameLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-                        
-                        <org.chromium.ui.widget.TextViewWithClickableSpans
-                            android:id="@+id/description"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center_horizontal"
-                            android:lineSpacingMultiplier="1.4"
-                            android:text="@string/signin_account_choice_description"
-                            android:textColor="@color/signin_light_text_color"
-                            android:textSize="@dimen/fre_normal_text_size"
-                            android:visibility="visible"/>
-                            
-                        <!-- We use an invisible TextView overlapping with the visible one to keep
-                        the layout constant between text changes. This TextView will have its
-                        contents programmatically set to the longest string the above TextView can
-                        contain. -->
-                        
-                        <org.chromium.ui.widget.TextViewWithClickableSpans
-                            android:id="@+id/longest_description"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:gravity="center"
-                            android:lineSpacingMultiplier="1.4"
-                            android:textColor="@color/signin_light_text_color"
-                            android:textSize="@dimen/fre_normal_text_size"
-                            android:visibility="invisible"/>
-
-                    </FrameLayout>
-
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <LinearLayout
-        android:id="@+id/button_bar"
-        android:layout_width="match_parent"
-        android:layout_height="76dp"
-        android:layout_gravity="bottom"
-        android:orientation="horizontal" 
-        android:padding="@dimen/fre_button_padding" >
-
-        <!--suppress ButtonStyle -->
-        <Button
-            android:id="@+id/negative_button"
-            style="@style/ButtonCompatBorderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/no_thanks"
-            android:textAllCaps="true"
-            android:textColor="@color/light_normal_color"
-            android:textSize="15sp" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:visibility="invisible"/>
-
-        <!--suppress ButtonStyle -->
-        <org.chromium.ui.widget.ButtonCompat
-            android:id="@+id/positive_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/choose_account_sign_in"
-            android:textAllCaps="true"
-            android:textColor="@android:color/white"
-            android:textSize="15sp"
-            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.signin.AccountSigninView>