Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/views/website_settings/website_settings_popup_view.h

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.h
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h
index 06d940da383063a6491574afdf3b6a40a08f8b01..3900e76bcfd540d85415fb0297cf23588a179a7d 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.h
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.h
@@ -13,7 +13,6 @@
 #include "chrome/browser/ui/views/website_settings/chosen_object_row_observer.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
-#include "components/security_state/security_state_model.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/button/button.h"
@@ -33,6 +32,10 @@ namespace net {
 class X509Certificate;
 }
 
+namespace security_state {
+struct SecurityInfo;
+}  // namespace security_state
+
 namespace test {
 class WebsiteSettingsPopupViewTestApi;
 }
@@ -74,13 +77,12 @@ class WebsiteSettingsPopupView : public content::WebContentsObserver,
   };
 
   // If |anchor_view| is null, |anchor_rect| is used to anchor the bubble.
-  static void ShowPopup(
-      views::View* anchor_view,
-      const gfx::Rect& anchor_rect,
-      Profile* profile,
-      content::WebContents* web_contents,
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  static void ShowPopup(views::View* anchor_view,
+                        const gfx::Rect& anchor_rect,
+                        Profile* profile,
+                        content::WebContents* web_contents,
+                        const GURL& url,
+                        const security_state::SecurityInfo& security_info);
 
   // Returns the type of the popup bubble being shown.
   static PopupType GetShownPopupType();
@@ -88,13 +90,12 @@ class WebsiteSettingsPopupView : public content::WebContentsObserver,
  private:
   friend class test::WebsiteSettingsPopupViewTestApi;
 
-  WebsiteSettingsPopupView(
-      views::View* anchor_view,
-      gfx::NativeView parent_window,
-      Profile* profile,
-      content::WebContents* web_contents,
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  WebsiteSettingsPopupView(views::View* anchor_view,
+                           gfx::NativeView parent_window,
+                           Profile* profile,
+                           content::WebContents* web_contents,
+                           const GURL& url,
+                           const security_state::SecurityInfo& security_info);
 
   // WebContentsObserver implementation.
   void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;