Delete pre-MD code from OmniboxResultView

components/toolbar/toolbar_model_impl.cc

 // Copyright 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 "components/toolbar/toolbar_model_impl.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
-#include "components/grit/components_scaled_resources.h"
 #include "components/prefs/pref_service.h"
 #include "components/security_state/security_state_model.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/toolbar/toolbar_model_delegate.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 41 matching lines @@
 }
 
 SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
   // When editing or empty, assume no security style.
   return ((input_in_progress() && !ignore_editing) || !ShouldDisplayURL())
              ? SecurityStateModel::NONE
              : delegate_->GetSecurityLevel();
 }
 
-int ToolbarModelImpl::GetIcon() const {
-  switch (GetSecurityLevel(false)) {
-    case SecurityStateModel::NONE:
-    case SecurityStateModel::HTTP_SHOW_WARNING:
-      return IDR_LOCATION_BAR_HTTP;
-    case SecurityStateModel::EV_SECURE:
-    case SecurityStateModel::SECURE:
-      return IDR_OMNIBOX_HTTPS_VALID;
-    case SecurityStateModel::SECURITY_WARNING:
-      // Surface Dubious as Neutral.
-      return IDR_LOCATION_BAR_HTTP;
-    case SecurityStateModel::SECURE_WITH_POLICY_INSTALLED_CERT:
-      return IDR_OMNIBOX_HTTPS_POLICY_WARNING;
-    case SecurityStateModel::DANGEROUS:
-      return IDR_OMNIBOX_HTTPS_INVALID;
-  }
-
-  NOTREACHED();
-  return IDR_LOCATION_BAR_HTTP;
-}
-
 gfx::VectorIconId ToolbarModelImpl::GetVectorIcon() const {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)

[Peter Kasting, 2016/10/06 04:45:36]

The fact that this #if is still here makes me worry about whether mobile could
still reach the GetIcon() code above before this patch.

[Evan Stade, 2016/10/06 15:16:37]

yea, I wasn't sure either but I got green try runs. I think they just stopped
calling GetIcon at some point, but still use at least some of the rest of this
file.

   switch (GetSecurityLevel(false)) {
     case SecurityStateModel::NONE:
     case SecurityStateModel::HTTP_SHOW_WARNING:
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
     case SecurityStateModel::EV_SECURE:
     case SecurityStateModel::SECURE:
       return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID;
     case SecurityStateModel::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
     case SecurityStateModel::SECURE_WITH_POLICY_INSTALLED_CERT:
       return gfx::VectorIconId::BUSINESS;
     case SecurityStateModel::DANGEROUS:
       return gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID;
   }
 #endif
-
   NOTREACHED();
   return gfx::VectorIconId::VECTOR_ICON_NONE;
 }
 
 base::string16 ToolbarModelImpl::GetEVCertName() const {
   if (GetSecurityLevel(false) != SecurityStateModel::EV_SECURE)
     return base::string16();
 
   // Note: cert is guaranteed non-NULL or the security level would be NONE.
   scoped_refptr<net::X509Certificate> cert = delegate_->GetCertificate();
@@ skipping 17 matching lines @@
                                            ? IDS_DANGEROUS_VERBOSE_STATE
                                            : IDS_NOT_SECURE_VERBOSE_STATE);
     default:
       return base::string16();
   }
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }