Refactor connection_security into SecurityStateModel

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index c14d9f7042f1f074687009b35f94f20afec1a455..f601b8c4c156e70e2b7e84c013efe670fbe458c6 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -141,7 +141,7 @@ OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
           make_scoped_ptr(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_window_mode_(popup_window_mode),
-      security_level_(connection_security::NONE),
+      security_level_(SecurityStateModel::NONE),
       saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
@@ -226,7 +226,7 @@ void OmniboxViewViews::ResetTabState(content::WebContents* web_contents) {
 }
 
 void OmniboxViewViews::Update() {
-  const connection_security::SecurityLevel old_security_level = security_level_;
+  const SecurityStateModel::SecurityLevel old_security_level = security_level_;
   UpdateSecurityLevel();
   if (model()->UpdatePermanentText()) {
     // Something visibly changed.  Re-enable URL replacement.
@@ -328,7 +328,7 @@ void OmniboxViewViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   views::Textfield::OnNativeThemeChanged(theme);
   if (location_bar_view_) {
     SetBackgroundColor(location_bar_view_->GetColor(
-        connection_security::NONE, LocationBarView::BACKGROUND));
+        SecurityStateModel::NONE, LocationBarView::BACKGROUND));
   }
   EmphasizeURLComponents();
 }
@@ -647,11 +647,10 @@ void OmniboxViewViews::EmphasizeURLComponents() {
   // may have incorrectly identified a qualifier as a scheme.
   SetStyle(gfx::DIAGONAL_STRIKE, false);
   if (!model()->user_input_in_progress() && text_is_url &&
-      scheme.is_nonempty() && (security_level_ != connection_security::NONE)) {
+      scheme.is_nonempty() && (security_level_ != SecurityStateModel::NONE)) {
     SkColor security_color = location_bar_view_->GetColor(
         security_level_, LocationBarView::SECURITY_TEXT);
-    const bool strike =
-        (security_level_ == connection_security::SECURITY_ERROR);
+    const bool strike = (security_level_ == SecurityStateModel::SECURITY_ERROR);
     const gfx::Range scheme_range(scheme.begin, scheme.end());
     ApplyColor(security_color, scheme_range);
     ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);