Refactor SecurityStateModel/Clients for simplicity and reusability.

ios/chrome/browser/ui/omnibox/omnibox_util.cc

 // Copyright 2016 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 "ios/chrome/browser/ui/omnibox/omnibox_util.h"
 
 #include "base/logging.h"
 #include "ios/chrome/grit/ios_theme_resources.h"
 
 int GetIconForAutocompleteMatchType(AutocompleteMatchType::Type type,
@@ skipping 31 matching lines @@
       return is_incognito ? IDR_IOS_OMNIBOX_SEARCH_INCOGNITO
                           : IDR_IOS_OMNIBOX_SEARCH;
     case AutocompleteMatchType::CALCULATOR:
     case AutocompleteMatchType::EXTENSION_APP:
     case AutocompleteMatchType::NUM_TYPES:
       NOTREACHED();
       return IDR_IOS_OMNIBOX_HTTP;
   }
 }
 
-int GetIconForSecurityState(
-    security_state::SecurityStateModel::SecurityLevel security_level) {
+int GetIconForSecurityState(security_state::SecurityLevel security_level) {
   switch (security_level) {
-    case security_state::SecurityStateModel::NONE:
-    case security_state::SecurityStateModel::HTTP_SHOW_WARNING:
+    case security_state::NONE:
+    case security_state::HTTP_SHOW_WARNING:
       return IDR_IOS_OMNIBOX_HTTP;
-    case security_state::SecurityStateModel::EV_SECURE:
-    case security_state::SecurityStateModel::SECURE:
+    case security_state::EV_SECURE:
+    case security_state::SECURE:
       return IDR_IOS_OMNIBOX_HTTPS_VALID;
-    case security_state::SecurityStateModel::SECURITY_WARNING:
+    case security_state::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return IDR_IOS_OMNIBOX_HTTP;
-    case security_state::SecurityStateModel::SECURE_WITH_POLICY_INSTALLED_CERT:
+    case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
       return IDR_IOS_OMNIBOX_HTTPS_POLICY_WARNING;
-    case security_state::SecurityStateModel::DANGEROUS:
+    case security_state::DANGEROUS:
       return IDR_IOS_OMNIBOX_HTTPS_INVALID;
   }
 }