Refactor connection_security into SecurityStateModel

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/connection_security.h"
+#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.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 "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 50 matching lines @@
 
 bool HostedAppBrowserController::SupportsLocationBar() const {
   return !should_use_web_app_frame();
 }
 
 bool HostedAppBrowserController::ShouldShowLocationBar() const {
   const Extension* extension =
       ExtensionRegistry::Get(browser_->profile())->GetExtensionById(
           extension_id_, ExtensionRegistry::EVERYTHING);
 
-  const content::WebContents* web_contents =
+  content::WebContents* web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
 
   // Default to not showing the location bar if either |extension| or
   // |web_contents| are null. |extension| is null for the dev tools.
   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;
 
-  connection_security::SecurityLevel security_level =
-      connection_security::GetSecurityLevelForWebContents(web_contents);
-  if (security_level == connection_security::SECURITY_ERROR)
+  SecurityStateModel* model = SecurityStateModel::FromWebContents(web_contents);
+  if (model &&
+      model->security_info().security_level ==
+          SecurityStateModel::SECURITY_ERROR)
     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