Refactor SecurityStateModel/Clients for simplicity and reusability.

chrome/browser/ui/extensions/hosted_app_browser_controller.cc

 // Copyright 2015 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/extensions/hosted_app_browser_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ssl/chrome_security_state_model_client.h"
+#include "chrome/browser/ssl/security_state_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
-#include "components/security_state/security_state_model.h"
+#include "components/security_state/core/security_state_model.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 
 bool IsSameOriginOrMoreSecure(const GURL& app_url, const GURL& page_url) {
@@ skipping 60 matching lines @@
   if (!extension || !web_contents)
     return false;
 
   if (!extension->is_hosted_app())
     return false;
 
   // Don't show a location bar until a navigation has occurred.
   if (web_contents->GetLastCommittedURL().is_empty())
     return false;
 
-  const ChromeSecurityStateModelClient* model_client =
-      ChromeSecurityStateModelClient::FromWebContents(web_contents);
-  security_state::SecurityStateModel::SecurityInfo security_info;
-  model_client->GetSecurityInfo(&security_info);
-  if (model_client &&
-      security_info.security_level ==
-          security_state::SecurityStateModel::DANGEROUS)
-    return true;
+  const SecurityStateTabHelper* helper =
+      SecurityStateTabHelper::FromWebContents(web_contents);
+  if (helper) {
+    security_state::SecurityStateModel::SecurityInfo security_info;
+    helper->GetSecurityInfo(&security_info);
+    if (security_info.security_level ==
+        security_state::SecurityStateModel::DANGEROUS)
+      return true;
+  }
 
   GURL launch_url = AppLaunchInfo::GetLaunchWebURL(extension);
   return !(IsSameOriginOrMoreSecure(launch_url,
                                     web_contents->GetVisibleURL()) &&
            IsSameOriginOrMoreSecure(launch_url,
                                     web_contents->GetLastCommittedURL()));
 }
 
 void HostedAppBrowserController::UpdateLocationBarVisibility(
     bool animate) const {
   if (!SupportsLocationBar())
     return;
 
   browser_->window()->GetLocationBar()->UpdateLocationBarVisibility(
       ShouldShowLocationBar(), animate);
 }
 
 }  // namespace extensions