[WebLayer] Reuse Chrome's InfoBarCompactLayout.java

//chrome's InfoBarCompactLayout.java has been componentized and
//weblayer can now use it directly rather than a custom fork. This CL
makes that change. The only differences in the //weblayer version were
the following:

- It had brought in the createCloseButton() implementation from
  //chrome's InfoBarLayout.java as InfoBarLayout.java wasn't brought
  into //weblayer for the initial implementation. The componentized
  InfoBarCompactLayout.java calls the now-componentized
  InfoBarLayout.java directly. The implementations are identical.
- It forked a string resource; this CL undoes that forking. Again,
  the values of the resource were identical.

There is no functional change.

Bug: 1099169
Change-Id: Idefdf0c0726f79512f10cc82ddc93ffd453f7dc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2265994Reviewed-by: Clark DuVall <cduvall@chromium.org>
Commit-Queue: Colin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782989}

weblayer/browser/java/BUILD.gn

@@ -96,7 +96,6 @@ android_library("java") {
     "org/chromium/weblayer_private/FragmentWindowAndroid.java",
     "org/chromium/weblayer_private/FullscreenCallbackProxy.java",
     "org/chromium/weblayer_private/InfoBar.java",
-    "org/chromium/weblayer_private/InfoBarCompactLayout.java",
     "org/chromium/weblayer_private/InfoBarContainer.java",
     "org/chromium/weblayer_private/InfoBarContainerLayout.java",
     "org/chromium/weblayer_private/InfoBarContainerView.java",
@@ -249,6 +248,7 @@ android_library("test_java") {
     ":java",
     ":weblayer_test_resources",
     "//base:jni_java",
+    "//components/infobars/android:java",
     "//components/location/android:location_java",
     "//components/permissions/android:java",
     "//content/public/test/android:content_java_test_support",

weblayer/browser/java/org/chromium/weblayer_private/InfoBar.java

@@ -16,6 +16,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.chrome.browser.infobar.InfoBarIdentifier;
+import org.chromium.components.infobars.InfoBarCompactLayout;
 import org.chromium.components.infobars.InfoBarInteractionHandler;
 import org.chromium.components.infobars.InfoBarLayout;
 import org.chromium.ui.modelutil.PropertyModel;

weblayer/browser/java/org/chromium/weblayer_private/TranslateCompactInfoBar.java

@@ -20,6 +20,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
 import org.chromium.base.metrics.RecordHistogram;
+import org.chromium.components.infobars.InfoBarCompactLayout;
 import org.chromium.ui.widget.Toast;
 
 /**

weblayer/browser/java/org/chromium/weblayer_private/test/TestInfoBar.java

@@ -9,9 +9,9 @@ import androidx.annotation.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.NativeMethods;
+import org.chromium.components.infobars.InfoBarCompactLayout;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.weblayer_private.InfoBar;
-import org.chromium.weblayer_private.InfoBarCompactLayout;
 import org.chromium.weblayer_private.TabImpl;
 
 /**

weblayer/browser/java/weblayer_strings.grd

@@ -175,9 +175,6 @@
       <message name="IDS_WEBLAYER_BOTTOM_BAR_SCREEN_POSITION" desc="Accessibility label to inform users about the InfoBar location">
         Options available near bottom of the screen
       </message>
-      <message name="IDS_WEBLAYER_INFOBAR_CLOSE" desc="Accessibility label for the dismiss infobar Button">
-        Close
-      </message>
       <!-- TranslateInfoBar -->
       <message name="IDS_TRANSLATE_INFOBAR_ERROR">
         Oops. This page could not be translated.