Replace return button with close button on custom tab toolbar

chrome/android/java/res/layout/custom_tabs_toolbar.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.toolbar.CustomTabToolbar xmlns:android="http://schemas.android.com/apk/res/android">
     <org.chromium.chrome.browser.widget.TintedImageButton
-        android:id="@+id/back_button"
+        android:id="@+id/close_button"
         style="@style/ToolbarButton"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/btn_chevron_left" />
+        android:src="@drawable/btn_close" />

[Yusuf, 2015/06/24 21:23:36]

in the bug it mentions we would like to give a choice here rather than
defaulting to x only. Should we not be adding an extra for this and keeping the
chevron_left image?

[Ian Wen, 2015/06/29 22:07:24]

Added an intent extra in the next patch.

     <ImageButton android:id="@+id/security_button"
         style="@style/LocationBarButton"
         android:layout_width="@dimen/location_bar_icon_width"
         android:layout_height="match_parent"
         android:layout_marginStart="48dp"
         android:scaleType="center"
         android:layout_gravity="center_vertical"
         android:alpha="0"
         android:visibility="gone"
         android:contentDescription="@string/accessibility_toolbar_btn_site_info" />
@@ skipping 48 matching lines @@
         android:contentDescription="@string/accessibility_toolbar_btn_menu"
         android:background="@null" />
     <org.chromium.chrome.browser.widget.ToolbarProgressBar
         android:id="@+id/progress"
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:progressDrawable="@drawable/progress_bar"
         android:layout_width="match_parent"
         android:layout_height="2dp"
         android:progress="0" />
 </org.chromium.chrome.browser.toolbar.CustomTabToolbar>