Componentize SecurityStateModel

chrome/browser/ui/toolbar/toolbar_model_impl.cc

Index: chrome/browser/ui/toolbar/toolbar_model_impl.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
index 0cefbc6b0e367c96cecee20b110e111835a707ad..c06bf1fd44098e9f66830f516101341fbd967ac0 100644
--- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc
+++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/ssl/security_state_model.h"
+#include "chrome/browser/ssl/chrome_security_state_model_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -129,13 +129,14 @@ SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
   // initialization), assume no security style.
   if (!web_contents)
     return SecurityStateModel::NONE;
-  const SecurityStateModel* model =
-      SecurityStateModel::FromWebContents(web_contents);
+  const ChromeSecurityStateModelDelegate* model_delegate =
+      ChromeSecurityStateModelDelegate::FromWebContents(web_contents);
 
   // When editing, assume no security style.
   return (input_in_progress() && !ignore_editing)
              ? SecurityStateModel::NONE
-             : model->GetSecurityInfo().security_level;
+             : static_cast<SecurityStateModel::SecurityLevel>(
+                   model_delegate->GetSecurityInfo().security_level);
 }
 
 int ToolbarModelImpl::GetIcon() const {