Safety Tip: Switch to shield on Android infobar.

This CL swaps the lightbulb icon for the new hybrid shield-bulb and
switches to the "big icon" infobar.  This CL also removes the lightbulb
icon from Android, since nothing is using it anymore.

Bug: 1000337
Change-Id: Iabacf98e0a568bfaff03e8e6a0318f055cfe74a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1783279Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Commit-Queue: Joe DeBlasio <jdeblasio@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696995}

chrome/android/java/src/org/chromium/chrome/browser/infobar/SafetyTipInfoBar.java

@@ -55,6 +55,7 @@ public class SafetyTipInfoBar extends ConfirmInfoBar {
     @Override
     public void createContent(InfoBarLayout layout) {
         super.createContent(layout);
+        layout.setIsUsingBigIcon();
         layout.getMessageLayout().addDescription(mDescription);
     }
 }

chrome/browser/android/resource_id.h

@@ -55,10 +55,10 @@ DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PREVIEWS,
                     R.drawable.infobar_chrome)
 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER,
                     R.drawable.infobar_protected_media_identifier)
+DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_SAFETYTIP_SHIELD,
+                    R.drawable.safetytip_shield)
 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_SAVE_PASSWORD,
                     R.drawable.ic_vpn_key_blue)
-DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_TIP,
-                    R.drawable.ic_lightbulb_outline_googblue_24dp)
 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_TRANSLATE, R.drawable.infobar_translate)
 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_WARNING, R.drawable.infobar_warning)
 DECLARE_RESOURCE_ID(IDR_ANDROID_INFOBAR_PHONE_ICON,

chrome/browser/lookalikes/safety_tips/safety_tip_infobar_delegate.cc

@@ -96,7 +96,7 @@ SafetyTipInfoBarDelegate::GetIdentifier() const {
 }
 
 int SafetyTipInfoBarDelegate::GetIconId() const {
-  return IDR_ANDROID_INFOBAR_TIP;
+  return IDR_ANDROID_INFOBAR_SAFETYTIP_SHIELD;
 }
 
 void SafetyTipInfoBarDelegate::InfoBarDismissed() {