Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/website_settings/website_settings.h

Index: chrome/browser/ui/website_settings/website_settings.h
diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h
index ae1aceb7181ccb64d44cd51188c24af0f788f864..7b9b4aca2e1297e929ed2ec8bc1e9f50b02d7e71 100644
--- a/chrome/browser/ui/website_settings/website_settings.h
+++ b/chrome/browser/ui/website_settings/website_settings.h
@@ -10,7 +10,7 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
@@ -116,13 +116,12 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver,
   // Creates a WebsiteSettings for the passed |url| using the given |ssl| status
   // object to determine the status of the site's connection. The
   // |WebsiteSettings| takes ownership of the |ui|.
-  WebsiteSettings(
-      WebsiteSettingsUI* ui,
-      Profile* profile,
-      TabSpecificContentSettings* tab_specific_content_settings,
-      content::WebContents* web_contents,
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  WebsiteSettings(WebsiteSettingsUI* ui,
+                  Profile* profile,
+                  TabSpecificContentSettings* tab_specific_content_settings,
+                  content::WebContents* web_contents,
+                  const GURL& url,
+                  const security_state::SecurityInfo& security_info);
   ~WebsiteSettings() override;
 
   void RecordWebsiteSettingsAction(WebsiteSettingsAction action);
@@ -161,9 +160,7 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver,
 
  private:
   // Initializes the |WebsiteSettings|.
-  void Init(
-      const GURL& url,
-      const security_state::SecurityStateModel::SecurityInfo& security_info);
+  void Init(const GURL& url, const security_state::SecurityInfo& security_info);
 
   // Sets (presents) the information about the site's permissions in the |ui_|.
   void PresentSitePermissions();
@@ -238,7 +235,7 @@ class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver,
 
   Profile* profile_;
 
-  security_state::SecurityStateModel::SecurityLevel security_level_;
+  security_state::SecurityLevel security_level_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
 };