Pull SecurityStateModel out into a component

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index dfa612aa60e2ac9c3c431852b440727b709e325e..1b56cf7bec9fdd70a7ad017ef19ea6299b72afce 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
-#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -20,6 +19,7 @@
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
+#include "components/security_state/security_state_model.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/cert_store.h"
@@ -123,35 +123,35 @@ bool ToolbarModelImpl::WouldPerformSearchTermReplacement(
   return !GetSearchTerms(ignore_editing).empty();
 }
 
-SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
-    bool ignore_editing) const {
+security_state::SecurityStateModel::SecurityLevel
+ToolbarModelImpl::GetSecurityLevel(bool ignore_editing) const {
   const content::WebContents* web_contents = delegate_->GetActiveWebContents();
   // If there is no active WebContents (which can happen during toolbar
   // initialization), assume no security style.
   if (!web_contents)
-    return SecurityStateModel::NONE;
+    return security_state::SecurityStateModel::NONE;
   const ChromeSecurityStateModelClient* model_client =
       ChromeSecurityStateModelClient::FromWebContents(web_contents);
 
   // When editing, assume no security style.
   return (input_in_progress() && !ignore_editing)
-             ? SecurityStateModel::NONE
+             ? security_state::SecurityStateModel::NONE
              : model_client->GetSecurityInfo().security_level;
 }
 
 int ToolbarModelImpl::GetIcon() const {
   switch (GetSecurityLevel(false)) {
-    case SecurityStateModel::NONE:
+    case security_state::SecurityStateModel::NONE:
       return IDR_LOCATION_BAR_HTTP;
-    case SecurityStateModel::EV_SECURE:
-    case SecurityStateModel::SECURE:
+    case security_state::SecurityStateModel::EV_SECURE:
+    case security_state::SecurityStateModel::SECURE:
       return IDR_OMNIBOX_HTTPS_VALID;
-    case SecurityStateModel::SECURITY_WARNING:
+    case security_state::SecurityStateModel::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return IDR_LOCATION_BAR_HTTP;
-    case SecurityStateModel::SECURITY_POLICY_WARNING:
+    case security_state::SecurityStateModel::SECURITY_POLICY_WARNING:
       return IDR_OMNIBOX_HTTPS_POLICY_WARNING;
-    case SecurityStateModel::SECURITY_ERROR:
+    case security_state::SecurityStateModel::SECURITY_ERROR:
       return IDR_OMNIBOX_HTTPS_INVALID;
   }
 
@@ -162,17 +162,17 @@ int ToolbarModelImpl::GetIcon() const {
 gfx::VectorIconId ToolbarModelImpl::GetVectorIcon() const {
 #if !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_IOS)
   switch (GetSecurityLevel(false)) {
-    case SecurityStateModel::NONE:
+    case security_state::SecurityStateModel::NONE:
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
-    case SecurityStateModel::EV_SECURE:
-    case SecurityStateModel::SECURE:
+    case security_state::SecurityStateModel::EV_SECURE:
+    case security_state::SecurityStateModel::SECURE:
       return gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID;
-    case SecurityStateModel::SECURITY_WARNING:
+    case security_state::SecurityStateModel::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return gfx::VectorIconId::LOCATION_BAR_HTTP;
-    case SecurityStateModel::SECURITY_POLICY_WARNING:
+    case security_state::SecurityStateModel::SECURITY_POLICY_WARNING:
       return gfx::VectorIconId::BUSINESS;
-    case SecurityStateModel::SECURITY_ERROR:
+    case security_state::SecurityStateModel::SECURITY_ERROR:
       return gfx::VectorIconId::LOCATION_BAR_HTTPS_INVALID;
   }
 #endif
@@ -182,7 +182,7 @@ gfx::VectorIconId ToolbarModelImpl::GetVectorIcon() const {
 }
 
 base::string16 ToolbarModelImpl::GetEVCertName() const {
-  if (GetSecurityLevel(false) != SecurityStateModel::EV_SECURE)
+  if (GetSecurityLevel(false) != security_state::SecurityStateModel::EV_SECURE)
     return base::string16();
 
   // Note: Navigation controller and active entry are guaranteed non-NULL or
@@ -275,10 +275,11 @@ base::string16 ToolbarModelImpl::GetSearchTerms(bool ignore_editing) const {
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
-  SecurityStateModel::SecurityLevel security_level =
+  security_state::SecurityStateModel::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
-  return ((security_level == SecurityStateModel::NONE) ||
-          (security_level == SecurityStateModel::SECURITY_ERROR))
+  return ((security_level == security_state::SecurityStateModel::NONE) ||
+          (security_level ==
+           security_state::SecurityStateModel::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }