Revert of Revert of Move SecurityLevel into a class of its own

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 17e71f160a62ba0af032f463d989cdd3255e693e..b345a1b9e82b398c61263593eef34ecaf5d94e1a 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_model.cc
+++ b/chrome/browser/ui/toolbar/test_toolbar_model.cc
@@ -9,9 +9,10 @@
 TestToolbarModel::TestToolbarModel()
     : ToolbarModel(),
       perform_search_term_replacement_(false),
-      security_level_(NONE),
+      security_level_(ConnectionSecurityHelper::NONE),
       icon_(IDR_LOCATION_BAR_HTTP),
-      should_display_url_(true) {}
+      should_display_url_(true) {
+}
 
 TestToolbarModel::~TestToolbarModel() {}
 
@@ -36,7 +37,7 @@
   return perform_search_term_replacement_;
 }
 
-ToolbarModel::SecurityLevel TestToolbarModel::GetSecurityLevel(
+ConnectionSecurityHelper::SecurityLevel TestToolbarModel::GetSecurityLevel(
     bool ignore_editing) const {
   return security_level_;
 }
@@ -45,12 +46,15 @@
   return icon_;
 }
 
-int TestToolbarModel::GetIconForSecurityLevel(SecurityLevel level) const {
+int TestToolbarModel::GetIconForSecurityLevel(
+    ConnectionSecurityHelper::SecurityLevel level) const {
   return icon_;
 }
 
 base::string16 TestToolbarModel::GetEVCertName() const {
-  return (security_level_ == EV_SECURE) ? ev_cert_name_ : base::string16();
+  return (security_level_ == ConnectionSecurityHelper::EV_SECURE)
+             ? ev_cert_name_
+             : base::string16();
 }
 
 bool TestToolbarModel::ShouldDisplayURL() const {