Refactor SecurityStateModel/Clients for simplicity and reusability.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #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;
 class OmniboxPopupView;
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace ui {
 class Clipboard;
 }
 
 // Implements OmniboxView on an AutocompleteTextField.
 class OmniboxViewMac : public OmniboxView,
                        public AutocompleteTextFieldObserver {
  public:
   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,
                  Profile* profile,
                  CommandUpdater* command_updater,
                  AutocompleteTextField* field);
   ~OmniboxViewMac() override;
 
   // For use when switching tabs, this saves the current state onto the tab so
   // that it can be restored during a later call to Update().
@@ skipping 179 matching lines @@
   NSRange coalesced_range_update_;
 
   // The time of the first character insert operation that has not yet been
   // painted. Used to measure omnibox responsiveness with a histogram.
   base::TimeTicks insert_char_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_