Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/ui/toolbar/chrome_toolbar_model_delegate.h"
 
 #include "base/logging.h"
 #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/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/prefs/pref_service.h"
+#include "components/security_state/core/security_state.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/web_contents.h"
 
 ChromeToolbarModelDelegate::ChromeToolbarModelDelegate() {}
 
 ChromeToolbarModelDelegate::~ChromeToolbarModelDelegate() {}
 
 base::string16 ChromeToolbarModelDelegate::FormattedStringWithEquivalentMeaning(
@@ skipping 34 matching lines @@
         virtual_url.SchemeIs(content::kChromeUIScheme)) {
       if (!url.SchemeIs(content::kChromeUIScheme))
         url = virtual_url;
       return url.host() != chrome::kChromeUINewTabHost;
     }
   }
 
   return !search::IsInstantNTP(GetActiveWebContents());
 }
 
-security_state::SecurityStateModel::SecurityLevel
-ChromeToolbarModelDelegate::GetSecurityLevel() const {
+security_state::SecurityLevel ChromeToolbarModelDelegate::GetSecurityLevel()
+    const {
   content::WebContents* web_contents = GetActiveWebContents();
   // If there is no active WebContents (which can happen during toolbar
   // initialization), assume no security style.
   if (!web_contents)
-    return security_state::SecurityStateModel::NONE;
-  auto* client = ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  client->GetSecurityInfo(&security_info);
+    return security_state::NONE;
+  auto* helper = SecurityStateTabHelper::FromWebContents(web_contents);
+  security_state::SecurityInfo security_info;
+  helper->GetSecurityInfo(&security_info);
   return security_info.security_level;
 }
 
 scoped_refptr<net::X509Certificate> ChromeToolbarModelDelegate::GetCertificate()
     const {
   content::NavigationEntry* entry = GetNavigationEntry();
   if (!entry)
     return scoped_refptr<net::X509Certificate>();
   return entry->GetSSL().certificate;
 }
 
 bool ChromeToolbarModelDelegate::FailsMalwareCheck() const {
   content::WebContents* web_contents = GetActiveWebContents();
   // If there is no active WebContents (which can happen during toolbar
   // initialization), so nothing can fail.
   if (!web_contents)
     return false;
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  ChromeSecurityStateModelClient::FromWebContents(web_contents)
+  security_state::SecurityInfo security_info;
+  SecurityStateTabHelper::FromWebContents(web_contents)
       ->GetSecurityInfo(&security_info);
   return security_info.fails_malware_check;
 }
 
 content::NavigationController*
 ChromeToolbarModelDelegate::GetNavigationController() const {
   // This |current_tab| can be null during the initialization of the toolbar
   // during window creation (i.e. before any tabs have been added to the
   // window).
   content::WebContents* current_tab = GetActiveWebContents();
   return current_tab ? &current_tab->GetController() : nullptr;
 }
 
 content::NavigationEntry* ChromeToolbarModelDelegate::GetNavigationEntry()
     const {
   content::NavigationController* controller = GetNavigationController();
   return controller ? controller->GetVisibleEntry() : nullptr;
 }
 
 Profile* ChromeToolbarModelDelegate::GetProfile() const {
   content::NavigationController* controller = GetNavigationController();
   return controller
              ? Profile::FromBrowserContext(controller->GetBrowserContext())
              : nullptr;
 }