Refactor connection_security into SecurityStateModel

chrome/browser/ui/toolbar/toolbar_model_impl.cc

 // Copyright 2012 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/toolbar_model_impl.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.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/connection_security.h"
+#include "chrome/browser/ssl/security_state_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/cert_store.h"
@@ skipping 78 matching lines @@
   }
 
   return GURL(url::kAboutBlankURL);
 }
 
 bool ToolbarModelImpl::WouldPerformSearchTermReplacement(
     bool ignore_editing) const {
   return !GetSearchTerms(ignore_editing).empty();
 }
 
-connection_security::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
+SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
-  // When editing, assume no security style.
-  return (input_in_progress() && !ignore_editing)
-             ? connection_security::NONE
-             : connection_security::GetSecurityLevelForWebContents(
-                   delegate_->GetActiveWebContents());
+  content::WebContents* web_contents = delegate_->GetActiveWebContents();
+  SecurityStateModel* model =
+      web_contents ? SecurityStateModel::FromWebContents(web_contents)
+                   : nullptr;
+
+  // When editing, or if there is no available security model (for
+  // example, during startup when Browser::VisibleSSLStateChanged() has
+  // not yet been called), assume no security style.

[Avi (use Gerrit), 2015/09/03 22:57:36]

If you add the SSM to the tab helper set, then we should be able to assume that
we have one always, and simplify the code here.

[estark, 2015/09/03 23:16:40]

Done. (Though we still need to account for a null webcontents)

[Avi (use Gerrit), 2015/09/03 23:21:11]

Re a null WC, yep.

+  return ((input_in_progress() && !ignore_editing) || !model)
+             ? SecurityStateModel::NONE
+             : model->security_info().security_level;
 }
 
 int ToolbarModelImpl::GetIcon() const {
   if (WouldPerformSearchTermReplacement(false))
     return IDR_OMNIBOX_SEARCH_SECURED;
 
   return GetIconForSecurityLevel(GetSecurityLevel(false));
 }
 
 int ToolbarModelImpl::GetIconForSecurityLevel(
-    connection_security::SecurityLevel level) const {
+    SecurityStateModel::SecurityLevel level) const {
   switch (level) {
-    case connection_security::NONE:
+    case SecurityStateModel::NONE:
       return IDR_LOCATION_BAR_HTTP;
-    case connection_security::EV_SECURE:
-    case connection_security::SECURE:
+    case SecurityStateModel::EV_SECURE:
+    case SecurityStateModel::SECURE:
       return IDR_OMNIBOX_HTTPS_VALID;
-    case connection_security::SECURITY_WARNING:
+    case SecurityStateModel::SECURITY_WARNING:
       // Surface Dubious as Neutral.
       return IDR_LOCATION_BAR_HTTP;
-    case connection_security::SECURITY_POLICY_WARNING:
+    case SecurityStateModel::SECURITY_POLICY_WARNING:
       return IDR_OMNIBOX_HTTPS_POLICY_WARNING;
-    case connection_security::SECURITY_ERROR:
+    case SecurityStateModel::SECURITY_ERROR:
       return IDR_OMNIBOX_HTTPS_INVALID;
   }
 
   NOTREACHED();
   return IDR_LOCATION_BAR_HTTP;
 }
 
 base::string16 ToolbarModelImpl::GetEVCertName() const {
-  if (GetSecurityLevel(false) != connection_security::EV_SECURE)
+  if (GetSecurityLevel(false) != SecurityStateModel::EV_SECURE)
     return base::string16();
 
   // Note: Navigation controller and active entry are guaranteed non-NULL or
   // the security level would be NONE.
   scoped_refptr<net::X509Certificate> cert;
   content::CertStore::GetInstance()->RetrieveCert(
       GetNavigationController()->GetVisibleEntry()->GetSSL().cert_id, &cert);
 
   // EV are required to have an organization name and country.
   DCHECK(!cert->subject().organization_names.empty());
@@ skipping 72 matching lines @@
     return search_terms;
 
   // If the URL is using a Google base URL specified via the command line, we
   // bypass the security check below.
   if (entry &&
       google_util::StartsWithCommandLineGoogleBaseURL(entry->GetVirtualURL()))
     return search_terms;
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
-  connection_security::SecurityLevel security_level =
+  SecurityStateModel::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
-  return ((security_level == connection_security::NONE) ||
-          (security_level == connection_security::SECURITY_ERROR))
+  return ((security_level == SecurityStateModel::NONE) ||
+          (security_level == SecurityStateModel::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }