Refactor SecurityStateModel/Clients for simplicity and reusability.

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

Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
index 39d2deb8814aebfa7fb0a50625693ba96b12842c..6ce410c8e935e72d0b7f391efde941239bd48c93 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
@@ -14,7 +14,7 @@
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #include "components/omnibox/browser/omnibox_view.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 class CommandUpdater;
@@ -36,7 +36,7 @@ class OmniboxViewMac : public OmniboxView,
   static SkColor BaseTextColorSkia(bool in_dark_mode);
   static NSColor* BaseTextColor(bool in_dark_mode);
   static NSColor* GetSecureTextColor(
-      security_state::SecurityStateModel::SecurityLevel security_level,
+      security_state::SecurityLevel security_level,
       bool in_dark_mode);
 
   OmniboxViewMac(OmniboxEditController* controller,