Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/stl_util.h"
@@ skipping 110 matching lines @@
       keyword_hint_decoration_(new KeywordHintDecoration()),
       manage_passwords_decoration_(
           new ManagePasswordsDecoration(command_updater, this)),
       browser_(browser),
       location_bar_visible_(true),
       should_show_secure_verbose_(false),
       should_show_nonsecure_verbose_(false),
       should_animate_secure_verbose_(false),
       should_animate_nonsecure_verbose_(false),
       is_width_available_for_security_verbose_(false),
-      security_level_(security_state::SecurityStateModel::NONE),
+      security_level_(security_state::NONE),
       weak_ptr_factory_(this) {
   ScopedVector<ContentSettingImageModel> models =
       ContentSettingImageModel::GenerateContentSettingImageModels();
   for (ContentSettingImageModel* model : models.get()) {
     // ContentSettingDecoration takes ownership of its model.
     content_setting_decorations_.push_back(
         new ContentSettingDecoration(model, this, profile));
   }
   models.weak_clear();
 
@@ skipping 550 matching lines @@
 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const {
   return browser_->toolbar_model();
 }
 
 WebContents* LocationBarViewMac::GetWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 bool LocationBarViewMac::ShouldShowEVBubble() const {
   return GetToolbarModel()->GetSecurityLevel(false) ==
-         security_state::SecurityStateModel::EV_SECURE;
+         security_state::EV_SECURE;
 }
 
 bool LocationBarViewMac::ShouldShowSecurityState() const {
   if (omnibox_view_->IsEditingOrEmpty() ||
       omnibox_view_->model()->is_keyword_hint()) {
     return false;
   }
 
-  security_state::SecurityStateModel::SecurityLevel security =
+  security_state::SecurityLevel security =
       GetToolbarModel()->GetSecurityLevel(false);
 
-  if (security == security_state::SecurityStateModel::EV_SECURE)
+  if (security == security_state::EV_SECURE)
     return true;
-  else if (security == security_state::SecurityStateModel::SECURE)
+  else if (security == security_state::SECURE)
     return should_show_secure_verbose_;
 
   return should_show_nonsecure_verbose_ &&
-         (security == security_state::SecurityStateModel::DANGEROUS ||
-          security == security_state::SecurityStateModel::HTTP_SHOW_WARNING);
+         (security == security_state::DANGEROUS ||
+          security == security_state::HTTP_SHOW_WARNING);
 }
 
 bool LocationBarViewMac::IsLocationBarDark() const {
   return [[field_ window] inIncognitoModeWithSystemTheme];
 }
 
 NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
   const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
       profile())->GetTemplateURLForKeyword(keyword);
   if (template_url &&
@@ skipping 11 matching lines @@
 }
 
 SkColor LocationBarViewMac::GetLocationBarIconColor() const {
   bool in_dark_mode = IsLocationBarDark();
   if (in_dark_mode)
     return kMaterialDarkVectorIconColor;
 
   if (ShouldShowEVBubble())
     return gfx::kGoogleGreen700;
 
-  security_state::SecurityStateModel::SecurityLevel security_level =
+  security_state::SecurityLevel security_level =
       GetToolbarModel()->GetSecurityLevel(false);
 
-  if (security_level == security_state::SecurityStateModel::NONE ||
-      security_level == security_state::SecurityStateModel::HTTP_SHOW_WARNING) {
+  if (security_level == security_state::NONE ||
+      security_level == security_state::HTTP_SHOW_WARNING) {
     return gfx::kChromeIconGrey;
   }
 
   NSColor* srgb_color =
       OmniboxViewMac::GetSecureTextColor(security_level, in_dark_mode);
   NSColor* device_color =
       [srgb_color colorUsingColorSpace:[NSColorSpace deviceRGBColorSpace]];
   return skia::NSDeviceColorToSkColor(device_color);
 }
 
@@ skipping 125 matching lines @@
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
 
   return zoom_decoration_->UpdateIfNecessary(
       zoom::ZoomController::FromWebContents(web_contents), default_zoom_changed,
       IsLocationBarDark());
 }
 
 void LocationBarViewMac::UpdateSecurityState(bool tab_changed) {
-  using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
+  using SecurityLevel = security_state::SecurityLevel;
   SecurityLevel new_security_level = GetToolbarModel()->GetSecurityLevel(false);
 
   // If there's enough space, but the secure state decoration had animated
   // out, animate it back in. Otherwise, if the security state has changed,
   // animate the decoration if animation is enabled and the state changed is
   // not from a tab switch.
   if (ShouldShowSecurityState() && is_width_available_for_security_verbose_) {
     bool is_secure_to_secure = IsSecureConnection(new_security_level) &&
                                IsSecureConnection(security_level_);
     bool is_new_security_level =
         security_level_ != new_security_level && !is_secure_to_secure;
     if (!tab_changed && security_state_bubble_decoration_->HasAnimatedOut())
       security_state_bubble_decoration_->AnimateIn(false);
     else if (tab_changed || !CanAnimateSecurityLevel(new_security_level))
       security_state_bubble_decoration_->ShowWithoutAnimation();
     else if (is_new_security_level)
       security_state_bubble_decoration_->AnimateIn();
   } else if (!is_width_available_for_security_verbose_ ||
              CanAnimateSecurityLevel(security_level_)) {
     security_state_bubble_decoration_->AnimateOut();
   }
 
   security_level_ = new_security_level;
 }
 
 bool LocationBarViewMac::CanAnimateSecurityLevel(
-    security_state::SecurityStateModel::SecurityLevel level) const {
-  using SecurityLevel = security_state::SecurityStateModel::SecurityLevel;
+    security_state::SecurityLevel level) const {
+  using SecurityLevel = security_state::SecurityLevel;
   if (IsSecureConnection(level)) {
     return should_animate_secure_verbose_;
   } else if (security_level_ == SecurityLevel::DANGEROUS ||
              security_level_ == SecurityLevel::HTTP_SHOW_WARNING) {
     return should_animate_nonsecure_verbose_;
   } else {
     return false;
   }
 }
 
 bool LocationBarViewMac::IsSecureConnection(
-    security_state::SecurityStateModel::SecurityLevel level) const {
-  return level == security_state::SecurityStateModel::SECURE ||
-         level == security_state::SecurityStateModel::EV_SECURE;
+    security_state::SecurityLevel level) const {
+  return level == security_state::SECURE ||
+         level == security_state::EV_SECURE;
 }
 
 void LocationBarViewMac::UpdateAccessibilityViewPosition(
     LocationBarDecoration* decoration) {
   if (!decoration->IsVisible())
     return;
   NSRect r =
       [[field_ cell] frameForDecoration:decoration inFrame:[field_ frame]];
   [decoration->GetAccessibilityView() setFrame:r];
   [decoration->GetAccessibilityView() setNeedsDisplayInRect:r];
@@ skipping 19 matching lines @@
     OnDecorationsChanged();
 }
 
 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
   std::vector<LocationBarDecoration*> decorations = GetDecorations();
   std::vector<NSView*> views;
   for (auto* decoration : decorations)
     views.push_back(decoration->GetAccessibilityView());
   return views;
 }