Contextual Search UI changes for custom tabs

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java
index 6691b37cb68612d6be5a77431b97b6435a5ba001..cca1bb2cac769a18b556238445fb180a1315a036 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchPanelFeatures.java
@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.compositor.bottombar.contextualsearch;
 
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchFieldTrial;
+import org.chromium.chrome.browser.util.FeatureUtilities;
 
 /**
  * A utility class meant to determine whether certain features are available in the Search Panel.
@@ -33,23 +34,20 @@ public class ContextualSearchPanelFeatures {
      * @return {@code true} Whether the side search icon is available.
      */
     public static boolean isSearchIconAvailable() {
-        // TODO(twellington): check for custom tabs.
-        return !isSideSearchProviderIconAvailable();
+        return !isSideSearchProviderIconAvailable() && !FeatureUtilities.getCustomTabVisible();
     }
 
     /**
      * @return {@code true} Whether search term refining is available.
      */
     public static boolean isSearchTermRefiningAvailable() {
-        // TODO(twellington): check for custom tabs.
-        return true;
+        return !FeatureUtilities.getCustomTabVisible();
     }
 
     /**
      * @return {@code true} Whether the close button is available.
      */
     public static boolean isCloseButtonAvailable() {
-        // TODO(twellington): check for custom tabs.
-        return false;
+        return FeatureUtilities.getCustomTabVisible();
     }
 }