Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc

Index: chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
index a7ad353276198a2d4219211b1296a354ff91b19f..69e273a85d3a29eed9097b39612d68fd37f93513 100644
--- a/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
+++ b/chrome/browser/android/offline_pages/offline_page_mhtml_archiver.cc
@@ -15,8 +15,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
-#include "components/security_state/security_state_model.h"
+#include "chrome/browser/ssl/chrome_security_state_model.h"
+#include "components/security_state/core/security_state_model.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/mhtml_generation_params.h"
@@ -160,12 +160,12 @@ void OfflinePageMHTMLArchiver::OnGenerateMHTMLDone(
 }
 
 bool OfflinePageMHTMLArchiver::HasConnectionSecurityError() {
-  ChromeSecurityStateModelClient::CreateForWebContents(web_contents_);
-  ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents_);
-  DCHECK(model_client);
+  ChromeSecurityStateModel::CreateForWebContents(web_contents_);
+  ChromeSecurityStateModel* model =
+      ChromeSecurityStateModel::FromWebContents(web_contents_);
+  DCHECK(model);
   security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
+  model->GetSecurityInfo(&security_info);
   return security_state::SecurityStateModel::SecurityLevel::DANGEROUS ==
          security_info.security_level;
 }