LocationBar no longer needs to extend UrlBar.UrlBarDelegate

Bug: 1139481
Change-Id: Iff40d93d02e6e35aaf6573ecb1a60b582a263c9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500529
Commit-Queue: who/bttk <bttk@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821458}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar.java

@@ -623,7 +623,7 @@ public class CustomTabToolbar extends ToolbarLayout implements View.OnLongClickL
     /**
      * Custom tab-specific implementation of the LocationBar interface.
      */
-    private class CustomTabLocationBar implements LocationBar {
+    private class CustomTabLocationBar implements LocationBar, UrlBar.UrlBarDelegate {
         private ToolbarDataProvider mToolbarDataProvider;
 
         public CustomTabLocationBar(ToolbarDataProvider toolbarDataProvider) {

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

@@ -12,13 +12,12 @@ import androidx.annotation.Nullable;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.ntp.FakeboxDelegate;
 import org.chromium.chrome.browser.ntp.NewTabPage;
-import org.chromium.chrome.browser.omnibox.UrlBar.UrlBarDelegate;
 import org.chromium.chrome.browser.tab.Tab;
 
 /**
  * Container that holds the {@link UrlBar} and SSL state related with the current {@link Tab}.
  */
-public interface LocationBar extends UrlBarDelegate, Destroyable {
+public interface LocationBar extends Destroyable {
     /** Handle all necessary tasks that can be delayed until initialization completes. */
     default void onDeferredStartup() {}
 

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

@@ -39,7 +39,8 @@ import java.util.List;
  *
  * <p>The coordinator creates and owns elements within this component.
  */
-public final class LocationBarCoordinator implements LocationBar, FakeboxDelegate {
+public final class LocationBarCoordinator
+        implements LocationBar, FakeboxDelegate, UrlBar.UrlBarDelegate {
     /** Identifies coordinators with methods specific to a device type. */
     public interface SubCoordinator extends Destroyable {}