Remove find in page from CCT, remove bookmark star from Herbs

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
index 6c6ebf29c5d3b96609090217be867a54457ada57..cd367648dce00700fa46c580fad4fb9f2cf1f4d1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
@@ -56,12 +56,6 @@ public class CustomTabIntentDataProvider {
     public static final String EXTRA_IS_OPENED_BY_CHROME =
             "org.chromium.chrome.browser.customtabs.IS_OPENED_BY_CHROME";
 
-    /**
-     * Herb: Extra used by the main Chrome browser to enable the bookmark icon in the menu.
-     */
-    public static final String EXTRA_SHOW_STAR_ICON =
-            "org.chromium.chrome.browser.customtabs.SHOW_STAR_ICON";
-
     private static final int MAX_CUSTOM_MENU_ITEMS = 5;
     private static final String ANIMATION_BUNDLE_PREFIX =
             Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? "android:activity." : "android:";
@@ -92,9 +86,6 @@ public class CustomTabIntentDataProvider {
     /** Herb: Whether this CustomTabActivity was explicitly started by another Chrome Activity. */
     private boolean mIsOpenedByChrome;
 
-    /** Herb: Whether or not the bookmark button should be shown. */
-    private boolean mShowBookmarkItem;
-
     /**
      * Constructs a {@link CustomTabIntentDataProvider}.
      */
@@ -253,13 +244,6 @@ public class CustomTabIntentDataProvider {
     }
 
     /**
-     * @return Whether the bookmark item should be shown in the menu.
-     */
-    public boolean shouldShowBookmarkMenuItem() {
-        return mShowBookmarkItem;
-    }
-
-    /**
      * @return The params for the custom button that shows on the toolbar. If there is no applicable
      *         buttons, returns null.
      */
@@ -447,7 +431,5 @@ public class CustomTabIntentDataProvider {
 
         mIsOpenedByChrome = IntentUtils.safeGetBooleanExtra(
                 intent, EXTRA_IS_OPENED_BY_CHROME, false);
-        mShowBookmarkItem = IntentUtils.safeGetBooleanExtra(
-                intent, EXTRA_SHOW_STAR_ICON, false);
     }
 }