Always use vector icons for desktop infobars (when one is defined).

chrome/browser/ssl/ssl_add_certificate.cc

Index: chrome/browser/ssl/ssl_add_certificate.cc
diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc
index f45d54cba8a645f754df35c3dcc6e5faea9ce3bf..a9f26bf0cf977ef789f4147e614f43a79df7752b 100644
--- a/chrome/browser/ssl/ssl_add_certificate.cc
+++ b/chrome/browser/ssl/ssl_add_certificate.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/grit/theme_resources.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "components/infobars/core/infobar_delegate.h"
@@ -47,7 +46,6 @@ class SSLAddCertificateInfoBarDelegate : public ConfirmInfoBarDelegate {
   // ConfirmInfoBarDelegate:
   Type GetInfoBarType() const override;
   infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
-  int GetIconId() const override;
   gfx::VectorIconId GetVectorIconId() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
@@ -86,17 +84,9 @@ SSLAddCertificateInfoBarDelegate::GetIdentifier() const {
   return SSL_ADD_CERTIFICATE_INFOBAR_DELEGATE;
 }
 
-int SSLAddCertificateInfoBarDelegate::GetIconId() const {
-  // TODO(davidben): Use a more appropriate icon.
-  return IDR_INFOBAR_SAVE_PASSWORD;

[Peter Kasting, 2016/09/23 00:45:10]

So, this is safe to remove because this infobar isn't used on Android/iOS?

-}
-
 gfx::VectorIconId SSLAddCertificateInfoBarDelegate::GetVectorIconId() const {
-#if !defined(OS_MACOSX)
+  // TODO(davidben): Use a more appropriate icon.
   return gfx::VectorIconId::AUTOLOGIN;
-#else
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
-#endif
 }
 
 base::string16 SSLAddCertificateInfoBarDelegate::GetMessageText() const {
@@ -140,12 +130,8 @@ void ShowErrorInfoBar(int message_id,
   SimpleAlertInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents),
       infobars::InfoBarDelegate::SSL_ADD_CERTIFICATE,
-      IDR_INFOBAR_SAVE_PASSWORD,

[Peter Kasting, 2016/09/23 00:45:09]

(and similarly)

[Evan Stade, 2016/09/23 01:24:39]

yes, this file isn't compiled on mobile.

-#if !defined(OS_MACOSX)
+      0,
       gfx::VectorIconId::AUTOLOGIN,
-#else
-      gfx::VectorIconId::VECTOR_ICON_NONE,
-#endif
       l10n_util::GetStringFUTF16(
           IDS_ADD_CERT_ERR_INVALID_CERT, base::IntToString16(-cert_error),
           base::ASCIIToUTF16(net::ErrorToString(cert_error))),