Switch SecurityStateModel ownership to ChromeSecurityStateModelClient

chrome/browser/ssl/security_state_model.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/ssl/security_state_model.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/origin_util.h"
 #include "net/ssl/ssl_cipher_suite_names.h"
 #include "net/ssl/ssl_connection_status_flags.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #endif
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(SecurityStateModel);
-
 namespace {
 
 SecurityStateModel::SecurityLevel GetSecurityLevelForNonSecureFieldTrial() {
   std::string choice =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kMarkNonSecureAs);
   std::string group = base::FieldTrialList::FindFullName("MarkNonSecureAs");
 
   // Do not change this enum. It is used in the histogram.
   enum MarkNonSecureStatus { NEUTRAL, DUBIOUS, NON_SECURE, LAST_STATUS };
@@ skipping 145 matching lines @@
       mixed_content_status(SecurityStateModel::NO_MIXED_CONTENT),
       scheme_is_cryptographic(false),
       cert_status(0),
       cert_id(0),
       security_bits(-1),
       connection_status(0),
       is_secure_protocol_and_ciphersuite(false) {}
 
 SecurityStateModel::SecurityInfo::~SecurityInfo() {}
 
+SecurityStateModel::SecurityStateModel(content::WebContents* web_contents)
+    : web_contents_(web_contents) {}
+
 SecurityStateModel::~SecurityStateModel() {}
 
 const SecurityStateModel::SecurityInfo& SecurityStateModel::GetSecurityInfo()
     const {
   content::NavigationEntry* entry =
       web_contents_->GetController().GetVisibleEntry();
   if (!entry) {
     security_info_ = SecurityInfo();
     visible_url_ = GURL();
     visible_ssl_status_ = content::SSLStatus();
@@ skipping 16 matching lines @@
 
   SecurityInfoForRequest(
       entry->GetURL(), entry->GetSSL(),
       Profile::FromBrowserContext(web_contents_->GetBrowserContext()), cert,
       client_->UsedPolicyInstalledCertificate(), &security_info_);
   visible_url_ = entry->GetURL();
   visible_ssl_status_ = entry->GetSSL();
   return security_info_;
 }
 
+void SecurityStateModel::SetClient(SecurityStateModelClient* client) {
+  client_ = client;
+}
+
 // static
 void SecurityStateModel::SecurityInfoForRequest(
     const GURL& url,
     const content::SSLStatus& ssl,
     Profile* profile,
     const scoped_refptr<net::X509Certificate>& cert,
     bool used_policy_installed_certificate,
     SecurityInfo* security_info) {
   security_info->cert_id = ssl.cert_id;
   security_info->sha1_deprecation_status = GetSHA1DeprecationStatus(cert, ssl);
@@ skipping 10 matching lines @@
 
   security_info->sct_verify_statuses.clear();
   for (const auto& sct : ssl.signed_certificate_timestamp_ids) {
     security_info->sct_verify_statuses.push_back(sct.status);
   }
 
   security_info->security_level = GetSecurityLevelForRequest(
       url, ssl, profile, cert, security_info->sha1_deprecation_status,
       security_info->mixed_content_status, used_policy_installed_certificate);
 }
-
-SecurityStateModel::SecurityStateModel(content::WebContents* web_contents)
-    : web_contents_(web_contents),
-      client_(new ChromeSecurityStateModelClient(web_contents)) {}