Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/website_settings/website_settings.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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #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"
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
@@ skipping 83 matching lines @@
     int blocked_icon_id;
     int allowed_icon_id;
     int label_string_id;
     int delete_tooltip_string_id;
     const char* ui_name_key;
   };
 
   // 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);
 
   // This method is called when ever a permission setting is changed.
   void OnSitePermissionChanged(ContentSettingsType type,
                                ContentSetting value);
 
   // This method is called whenever access to an object is revoked.
   void OnSiteChosenObjectDeleted(const ChooserUIInfo& ui_info,
@@ skipping 18 matching lines @@
 
   base::string16 organization_name() const {
     return organization_name_;
   }
 
   // SiteDataObserver implementation.
   void OnSiteDataAccessed() override;
 
  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();
 
   // Sets (presents) the information about the site's data in the |ui_|.
   void PresentSiteData();
 
   // Sets (presents) the information about the site's identity and connection
   // in the |ui_|.
   void PresentSiteIdentity();
@@ skipping 54 matching lines @@
   HostContentSettingsMap* content_settings_;
 
   // Service for managing SSL error page bypasses. Used to revoke bypass
   // decisions by users.
   ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_;
 
   bool did_revoke_user_ssl_decisions_;
 
   Profile* profile_;
 
-  security_state::SecurityStateModel::SecurityLevel security_level_;
+  security_state::SecurityLevel security_level_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_