Refactor connection_security into SecurityStateModel

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

 // Copyright (c) 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 "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/metrics/histogram.h"
@@ skipping 526 matching lines @@
                                value:HostTextColor()
                                range:ComponentToNSRange(host)];
     }
   }
 
   ChromeToolbarModel* chrome_toolbar_model =
       static_cast<ChromeToolbarModel*>(controller()->GetToolbarModel());
   // 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 connection_security::SecurityLevel security_level =
+  const SecurityStateModel::SecurityLevel security_level =
       chrome_toolbar_model->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 != connection_security::NONE)) {
+      scheme.is_nonempty() && (security_level != SecurityStateModel::NONE)) {
     NSColor* color;
-    if (security_level == connection_security::EV_SECURE ||
-        security_level == connection_security::SECURE) {
+    if (security_level == SecurityStateModel::EV_SECURE ||
+        security_level == SecurityStateModel::SECURE) {
       color = SecureSchemeColor();
-    } else if (security_level == connection_security::SECURITY_ERROR) {
+    } else if (security_level == SecurityStateModel::SECURITY_ERROR) {
       color = SecurityErrorSchemeColor();
       // Add a strikethrough through the scheme.
       [attributedString addAttribute:NSStrikethroughStyleAttributeName
                  value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
                  range:ComponentToNSRange(scheme)];
-    } else if (security_level == connection_security::SECURITY_WARNING) {
+    } else if (security_level == SecurityStateModel::SECURITY_WARNING) {
       color = BaseTextColor();
     } else {
       NOTREACHED();
       color = BaseTextColor();
     }
     [attributedString addAttribute:NSForegroundColorAttributeName
                              value:color
                              range:ComponentToNSRange(scheme)];
   }
 }
@@ skipping 498 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }