Refactor SecurityStateModel/Clients for simplicity and reusability.

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 e98ba386e40f24052226c522cc534ac886b85196..09319ed476ebee085d02719a6f7c6a029062be86 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -30,7 +30,6 @@
 #include "components/omnibox/browser/omnibox_edit_controller.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
-#include "components/security_state/security_state_model.h"
 #include "components/toolbar/toolbar_model.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
@@ -175,18 +174,17 @@ NSColor* OmniboxViewMac::BaseTextColor(bool in_dark_mode) {
 
 // static
 NSColor* OmniboxViewMac::GetSecureTextColor(
-    security_state::SecurityStateModel::SecurityLevel security_level,
+    security_state::SecurityLevel security_level,
     bool in_dark_mode) {
-  if (security_level == security_state::SecurityStateModel::EV_SECURE ||
-      security_level == security_state::SecurityStateModel::SECURE) {
+  if (security_level == security_state::EV_SECURE ||
+      security_level == security_state::SECURE) {
     return SecureSchemeColor(in_dark_mode);
   }
 
-  if (security_level == security_state::SecurityStateModel::DANGEROUS)
+  if (security_level == security_state::DANGEROUS)
     return SecurityErrorSchemeColor(in_dark_mode);
 
-  DCHECK_EQ(security_state::SecurityStateModel::SECURITY_WARNING,
-            security_level);
+  DCHECK_EQ(security_state::SECURITY_WARNING, security_level);
   return SecurityWarningSchemeColor(in_dark_mode);
 }
 
@@ -599,16 +597,15 @@ void OmniboxViewMac::ApplyTextAttributes(
   // 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 security_state::SecurityStateModel::SecurityLevel security_level =
+  const security_state::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 != security_state::SecurityStateModel::NONE) &&
-      (security_level !=
-       security_state::SecurityStateModel::HTTP_SHOW_WARNING)) {
-    if (security_level == security_state::SecurityStateModel::DANGEROUS) {
+      (security_level != security_state::NONE) &&
+      (security_level != security_state::HTTP_SHOW_WARNING)) {
+    if (security_level == security_state::DANGEROUS) {
       // Add a strikethrough through the scheme.
       [attributedString addAttribute:NSStrikethroughStyleAttributeName
                  value:[NSNumber numberWithInt:NSUnderlineStyleSingle]