🔍 Refactor LocationBarLayout to fix SearchActivity's location bar

chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
index 607b81b29f36d32bfcdb4fb8c8fffb9a2925ec21..cddfbce89eb26f2a802ce0af5781f087fd00befa 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java
@@ -648,9 +648,13 @@ public class LocationBarLayout extends FrameLayout
     }
 
     public LocationBarLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, R.layout.location_bar);
+    }
+
+    public LocationBarLayout(Context context, AttributeSet attrs, int layoutId) {
         super(context, attrs);
 
-        LayoutInflater.from(context).inflate(R.layout.location_bar, this, true);
+        LayoutInflater.from(context).inflate(layoutId, this, true);
         mNavigationButton = (ImageView) findViewById(R.id.navigation_button);
         assert mNavigationButton != null : "Missing navigation type view.";
 
@@ -2334,6 +2338,7 @@ public class LocationBarLayout extends FrameLayout
      * Call to update the visibility of the buttons inside the location bar.
      */
     protected void updateButtonVisibility() {
+        updateDeleteButtonVisibility();
     }
 
     /**