Refactor SecurityStateModel/Clients for simplicity and reusability.

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/prefs/pref_service.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state.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"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 
-using security_state::SecurityStateModel;
-
 ToolbarModelImpl::ToolbarModelImpl(ToolbarModelDelegate* delegate,
                                    size_t max_url_display_chars)
     : delegate_(delegate), max_url_display_chars_(max_url_display_chars) {
   DCHECK(delegate_);
 }
 
 ToolbarModelImpl::~ToolbarModelImpl() {
 }
 
 // ToolbarModelImpl Implementation.
@@ skipping 18 matching lines @@
   return gfx::TruncateString(formatted_text, max_url_display_chars_ - 1,
                              gfx::CHARACTER_BREAK) +
          gfx::kEllipsisUTF16;
 }
 
 GURL ToolbarModelImpl::GetURL() const {
   GURL url;
   return delegate_->GetURL(&url) ? url : GURL(url::kAboutBlankURL);
 }
 
-SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
+security_state::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
   // When editing or empty, assume no security style.
   return ((input_in_progress() && !ignore_editing) || !ShouldDisplayURL())
-             ? SecurityStateModel::NONE
+             ? security_state::NONE
              : delegate_->GetSecurityLevel();
 }
 
 gfx::VectorIconId ToolbarModelImpl::GetVectorIcon() const {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   switch (GetSecurityLevel(false)) {
-    case SecurityStateModel::NONE:
-    case SecurityStateModel::HTTP_SHOW_WARNING:
+    case security_state::NONE:
+    case security_state::HTTP_SHOW_WARNING:
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
-    case SecurityStateModel::EV_SECURE:
-    case SecurityStateModel::SECURE:
+    case security_state::EV_SECURE:
+    case security_state::SECURE:
       return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID;
-    case SecurityStateModel::SECURITY_WARNING:
+    case security_state::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
-    case SecurityStateModel::SECURE_WITH_POLICY_INSTALLED_CERT:
+    case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
       return gfx::VectorIconId::BUSINESS;
-    case SecurityStateModel::DANGEROUS:
+    case security_state::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)
+  if (GetSecurityLevel(false) != security_state::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();
   DCHECK(cert.get());
 
   // EV are required to have an organization name and country.
   DCHECK(!cert->subject().organization_names.empty());
   DCHECK(!cert->subject().country_name.empty());
   return l10n_util::GetStringFUTF16(
       IDS_SECURE_CONNECTION_EV,
       base::UTF8ToUTF16(cert->subject().organization_names[0]),
       base::UTF8ToUTF16(cert->subject().country_name));
 }
 
 base::string16 ToolbarModelImpl::GetSecureVerboseText() const {
   switch (GetSecurityLevel(false)) {
-    case SecurityStateModel::HTTP_SHOW_WARNING:
+    case security_state::HTTP_SHOW_WARNING:
       return l10n_util::GetStringUTF16(IDS_NOT_SECURE_VERBOSE_STATE);
-    case SecurityStateModel::SECURE:
+    case security_state::SECURE:
       return l10n_util::GetStringUTF16(IDS_SECURE_VERBOSE_STATE);
-    case SecurityStateModel::DANGEROUS:
+    case security_state::DANGEROUS:
       return l10n_util::GetStringUTF16(delegate_->FailsMalwareCheck()
                                            ? IDS_DANGEROUS_VERBOSE_STATE
                                            : IDS_NOT_SECURE_VERBOSE_STATE);
     default:
       return base::string16();
   }
 }
 
 bool ToolbarModelImpl::ShouldDisplayURL() const {
   return delegate_->ShouldDisplayURL();
 }