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

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 006a7aa0d5fed8cce1623796092c30c72befb88a..7d296dd7b43eac1eeaa73540e8d966c7c8375408 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -512,23 +512,24 @@
   // TODO(shess): GTK has this as a member var, figure out why.
   // [Could it be to not change if no change?  If so, I'm guessing
   // AppKit may already handle that.]
-  const ToolbarModel::SecurityLevel security_level =
+  const ConnectionSecurityHelper::SecurityLevel security_level =
       controller()->GetToolbarModel()->GetSecurityLevel(false);
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
-      scheme.is_nonempty() && (security_level != ToolbarModel::NONE)) {
+      scheme.is_nonempty() &&
+      (security_level != ConnectionSecurityHelper::NONE)) {
     NSColor* color;
-    if (security_level == ToolbarModel::EV_SECURE ||
-        security_level == ToolbarModel::SECURE) {
+    if (security_level == ConnectionSecurityHelper::EV_SECURE ||
+        security_level == ConnectionSecurityHelper::SECURE) {
       color = SecureSchemeColor();
-    } else if (security_level == ToolbarModel::SECURITY_ERROR) {
+    } else if (security_level == ConnectionSecurityHelper::SECURITY_ERROR) {
       color = SecurityErrorSchemeColor();
       // Add a strikethrough through the scheme.
       [as addAttribute:NSStrikethroughStyleAttributeName
                  value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
                  range:ComponentToNSRange(scheme)];
-    } else if (security_level == ToolbarModel::SECURITY_WARNING) {
+    } else if (security_level == ConnectionSecurityHelper::SECURITY_WARNING) {
       color = BaseTextColor();
     } else {
       NOTREACHED();