Replace return button with close button on custom tab toolbar

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
index ba05df4b3f979a8639964bf08028f4018bcbd112..acc75e1e240f792b19fa72224d8734648fc2eb7c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java
@@ -132,10 +132,12 @@ public class CustomTabActivity extends ChromeActivity {
         mToolbarManager = new ToolbarManager(this, controlContainer,
                 mAppMenuHandler, mAppMenuPropertiesDelegate,
                 getCompositorViewHolder().getInvalidator());
+        mToolbarManager.setCloseButtonIcon(mIntentDataProvider.getCloseButtonIconRes());
         mToolbarManager.setShowTitle(mIntentDataProvider.getTitleVisibilityState()
                 == CustomTabIntentDataProvider.CUSTOM_TAB_SHOW_PAGE_TITLE);
         mToolbarManager.updatePrimaryColor(mIntentDataProvider.getToolbarColor());
         setStatusBarColor(mIntentDataProvider.getToolbarColor());
+

[Yusuf, 2015/06/29 23:05:58]

extra line

[Ian Wen, 2015/06/29 23:56:00]

Done.

         if (mIntentDataProvider.shouldShowActionButton()) {
             mToolbarManager.addCustomActionButton(mIntentDataProvider.getActionButtonIcon(),
                     new OnClickListener() {