Replace return button with close button on custom tab toolbar

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index 38654cecb01939fe8f46ddbf647917cd6b4ab5c8..88ab7b9e8ce5aad86e750351a3c2b2e4c2c0aa00 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -506,7 +506,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
         mToolbar.setOnTabSwitcherClickHandler(tabSwitcherClickHandler);
         mToolbar.setOnNewTabClickHandler(newTabClickHandler);
         mToolbar.setBookmarkClickHandler(bookmarkClickHandler);
-        mToolbar.setCustomTabReturnClickHandler(customTabsBackClickHandler);
+        mToolbar.setCustomTabCloseClickHandler(customTabsBackClickHandler);
 
         mToolbarModel.initializeWithNative();
 
@@ -797,6 +797,13 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
     }
 
     /**
+     * Sets the icon resource that the close button shows.
+     */
+    public void setCloseButtonIcon(int iconRes) {
+        mToolbar.setCloseButtonImageResource(iconRes);
+    }
+
+    /**
      * Sets whether a title should be shown within the Toolbar.
      * @param showTitle Whether a title should be shown.
      */