Refactor SecurityStateModel/Clients for simplicity and reusability.

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

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/omnibox/chrome_omnibox_client.h"
 #include "chrome/browser/ui/omnibox/clipboard_utils.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #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"
 #import "skia/ext/skia_utils_mac.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
@@ skipping 124 matching lines @@
                       : SkColorSetA(SK_ColorBLACK, 0x7F);
 }
 
 // static
 NSColor* OmniboxViewMac::BaseTextColor(bool in_dark_mode) {
   return skia::SkColorToSRGBNSColor(BaseTextColorSkia(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);
 }
 
 OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
                                Profile* profile,
                                CommandUpdater* command_updater,
                                AutocompleteTextField* field)
     : OmniboxView(
           controller,
           base::WrapUnique(new ChromeOmniboxClient(controller, profile))),
@@ skipping 392 matching lines @@
     if (!grey_out_url) {
       [attributedString addAttribute:NSForegroundColorAttributeName
                                value:HostTextColor(in_dark_mode)
                                range:ComponentToNSRange(host)];
     }
   }
 
   // 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]
                  range:ComponentToNSRange(scheme)];
     }
     [attributedString
         addAttribute:NSForegroundColorAttributeName
                value:GetSecureTextColor(security_level, in_dark_mode)
                range:ComponentToNSRange(scheme)];
   }
@@ skipping 499 matching lines @@
                               display_text);
   NSDictionary* notification_info = @{
       NSAccessibilityAnnouncementKey : announcement,
       NSAccessibilityPriorityKey :     @(NSAccessibilityPriorityHigh)
   };
   NSAccessibilityPostNotificationWithUserInfo(
       [field_ window],
       NSAccessibilityAnnouncementRequestedNotification,
       notification_info);
 }