Switch SecurityStateModel ownership to ChromeSecurityStateModelClient

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/chrome_security_state_model_client.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/elide_url.h"
@@ skipping 99 matching lines @@
   return !GetSearchTerms(ignore_editing).empty();
 }
 
 SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
     bool ignore_editing) const {
   const content::WebContents* web_contents = delegate_->GetActiveWebContents();
   // If there is no active WebContents (which can happen during toolbar
   // initialization), assume no security style.
   if (!web_contents)
     return SecurityStateModel::NONE;
-  const SecurityStateModel* model =
-      SecurityStateModel::FromWebContents(web_contents);
+  const ChromeSecurityStateModelClient* model_client =
+      ChromeSecurityStateModelClient::FromWebContents(web_contents);
 
   // When editing, assume no security style.
   return (input_in_progress() && !ignore_editing)
              ? SecurityStateModel::NONE
-             : model->GetSecurityInfo().security_level;
+             : model_client->GetSecurityInfo().security_level;
 }
 
 int ToolbarModelImpl::GetIcon() const {
   switch (GetSecurityLevel(false)) {
     case SecurityStateModel::NONE:
       return IDR_LOCATION_BAR_HTTP;
     case SecurityStateModel::EV_SECURE:
     case SecurityStateModel::SECURE:
       return IDR_OMNIBOX_HTTPS_VALID;
     case SecurityStateModel::SECURITY_WARNING:
@@ skipping 125 matching lines @@
 
   // Otherwise, extract search terms for HTTPS pages that do not have a security
   // error.
   SecurityStateModel::SecurityLevel security_level =
       GetSecurityLevel(ignore_editing);
   return ((security_level == SecurityStateModel::NONE) ||
           (security_level == SecurityStateModel::SECURITY_ERROR))
              ? base::string16()
              : search_terms;
 }