Refactor SecurityStateModel/Clients for simplicity and reusability.

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 90272371b31b0ee915df85c8724e001c4d5a3195..2469aa7f7502d1036d86527ae07ee02d34aade78 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -116,7 +116,7 @@ OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
           base::WrapUnique(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_window_mode_(popup_window_mode),
-      security_level_(security_state::SecurityStateModel::NONE),
+      security_level_(security_state::NONE),
       saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
       ime_composing_before_change_(false),
       delete_at_end_pressed_(false),
@@ -200,8 +200,7 @@ void OmniboxViewViews::ResetTabState(content::WebContents* web_contents) {
 }
 
 void OmniboxViewViews::Update() {
-  const security_state::SecurityStateModel::SecurityLevel old_security_level =
-      security_level_;
+  const security_state::SecurityLevel old_security_level = security_level_;
   UpdateSecurityLevel();
   if (model()->UpdatePermanentText()) {
     // Select all the new text if the user had all the old text selected, or if
@@ -624,12 +623,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_ != security_state::SecurityStateModel::NONE)) {
+      scheme.is_nonempty() && (security_level_ != security_state::NONE)) {
     SkColor security_color =
         location_bar_view_->GetSecureTextColor(security_level_);
-    const bool strike =
-        (security_level_ == security_state::SecurityStateModel::DANGEROUS);
+    const bool strike = (security_level_ == security_state::DANGEROUS);
     const gfx::Range scheme_range(scheme.begin, scheme.end());
     ApplyColor(security_color, scheme_range);
     ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);