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

chrome/browser/ssl/ssl_add_certificate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/ssl_add_certificate.h"
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #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"
 #include "components/infobars/core/simple_alert_infobar_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_database.h"
 #include "net/cert/x509_certificate.h"
@@ skipping 15 matching lines @@
   static void Create(InfoBarService* infobar_service,
                      net::X509Certificate* cert);
 
  private:
   explicit SSLAddCertificateInfoBarDelegate(net::X509Certificate* cert);
   ~SSLAddCertificateInfoBarDelegate() override;
 
   // 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;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
 
   // The certificate that was added.
   scoped_refptr<net::X509Certificate> cert_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLAddCertificateInfoBarDelegate);
@@ skipping 18 matching lines @@
 infobars::InfoBarDelegate::Type
 SSLAddCertificateInfoBarDelegate::GetInfoBarType() const {
   return PAGE_ACTION_TYPE;
 }
 
 infobars::InfoBarDelegate::InfoBarIdentifier
 SSLAddCertificateInfoBarDelegate::GetIdentifier() const {
   return SSL_ADD_CERTIFICATE_INFOBAR_DELEGATE;
 }
 
-int SSLAddCertificateInfoBarDelegate::GetIconId() const {
+gfx::VectorIconId SSLAddCertificateInfoBarDelegate::GetVectorIconId() 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)
   return gfx::VectorIconId::AUTOLOGIN;
-#else
-  return gfx::VectorIconId::VECTOR_ICON_NONE;
-#endif
 }
 
 base::string16 SSLAddCertificateInfoBarDelegate::GetMessageText() const {
   // TODO(evanm): GetDisplayName should return UTF-16.
   return l10n_util::GetStringFUTF16(IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
                                     base::UTF8ToUTF16(
                                         cert_->issuer().GetDisplayName()));
 }
 
 int SSLAddCertificateInfoBarDelegate::GetButtons() const {
@@ skipping 23 matching lines @@
   WebContents* web_contents = WebContents::FromRenderFrameHost(
       RenderFrameHost::FromID(render_process_id, render_frame_id));
   if (!web_contents)
     return;
 
   // TODO(davidben): Use a more appropriate icon.
   // TODO(davidben): Display a more user-friendly error string.
   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))),
       true);
 }
 
 void ShowSuccessInfoBar(int render_process_id,
                         int render_frame_id,
                         net::X509Certificate* cert) {
   WebContents* web_contents = WebContents::FromRenderFrameHost(
@@ skipping 52 matching lines @@
                  render_process_id, render_frame_id, cert_error));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&ShowSuccessInfoBar, render_process_id, render_frame_id,
                    base::RetainedRef(cert)));
   }
 }
 
 }  // namespace chrome