Revert of Refactor connection_security into SecurityStateModel

chrome/browser/ui/toolbar/test_toolbar_model.cc

Index: chrome/browser/ui/toolbar/test_toolbar_model.cc
diff --git a/chrome/browser/ui/toolbar/test_toolbar_model.cc b/chrome/browser/ui/toolbar/test_toolbar_model.cc
index ccec8f85d47e181db496ffd1e0dd3a1a7433e2e4..db50507ca86ae9b4b2df88722a35a0851159006c 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -9,7 +9,7 @@
 TestToolbarModel::TestToolbarModel()
     : ChromeToolbarModel(),
       perform_search_term_replacement_(false),
-      security_level_(SecurityStateModel::NONE),
+      security_level_(connection_security::NONE),
       icon_(IDR_LOCATION_BAR_HTTP),
       should_display_url_(true) {}
 
@@ -36,7 +36,7 @@
   return perform_search_term_replacement_;
 }
 
-SecurityStateModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
+connection_security::SecurityLevel TestToolbarModel::GetSecurityLevel(
     bool ignore_editing) const {
   return security_level_;
 }
@@ -46,8 +46,8 @@
 }
 
 base::string16 TestToolbarModel::GetEVCertName() const {
-  return (security_level_ == SecurityStateModel::EV_SECURE) ? ev_cert_name_
-                                                            : base::string16();
+  return (security_level_ == connection_security::EV_SECURE) ? ev_cert_name_
+                                                             : base::string16();
 }
 
 bool TestToolbarModel::ShouldDisplayURL() const {