Add constructor to create SSLStatus from SSLInfo

chrome/browser/ssl/ssl_blocking_page.cc

 // Copyright (c) 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/ssl/ssl_blocking_page.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/i18n/rtl.h"
@@ skipping 25 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/signed_certificate_timestamp_store.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/browser_resources.h"
 #include "grit/components_strings.h"
 #include "net/base/hash_value.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 227 matching lines @@
   std::vector<std::string> encoded_chain;
   ssl_info_.cert->GetPEMEncodedChain(
       &encoded_chain);
   load_time_data->SetString(
       "pem", base::JoinString(encoded_chain, base::StringPiece()));
 
   cert_report_helper_->PopulateExtendedReportingOption(load_time_data);
 }
 
 void SSLBlockingPage::OverrideEntry(NavigationEntry* entry) {
+  int process_id = web_contents()->GetRenderProcessHost()->GetID();
   int cert_id = content::CertStore::GetInstance()->StoreCert(

[meacer, 2015/09/09 18:26:07]

nit: const?

[estark, 2015/09/10 14:32:05]

Done.

-      ssl_info_.cert.get(), web_contents()->GetRenderProcessHost()->GetID());
+      ssl_info_.cert.get(), process_id);
   DCHECK(cert_id);
 
-  entry->GetSSL().security_style =
-      content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
-  entry->GetSSL().cert_id = cert_id;
-  entry->GetSSL().cert_status = ssl_info_.cert_status;
-  entry->GetSSL().security_bits = ssl_info_.security_bits;
+  content::SignedCertificateTimestampStore* sct_store(
+      content::SignedCertificateTimestampStore::GetInstance());
+  content::SignedCertificateTimestampIDStatusList sct_ids;
+  for (const auto& sct_and_status : ssl_info_.signed_certificate_timestamps) {
+    const int sct_id(sct_store->Store(sct_and_status.sct.get(), process_id));
+    DCHECK(sct_id);
+    sct_ids.push_back(content::SignedCertificateTimestampIDAndStatus(
+        sct_id, sct_and_status.status));
+  }
+
+  entry->GetSSL() =
+      content::SSLStatus(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, cert_id,
+                         sct_ids, ssl_info_);
 }
 
 void SSLBlockingPage::SetSSLCertReporterForTesting(
     scoped_ptr<SSLCertReporter> ssl_cert_reporter) {
   cert_report_helper_->SetSSLCertReporterForTesting(ssl_cert_reporter.Pass());
 }
 
 // This handles the commands sent from the interstitial JavaScript.
 // DO NOT reorder or change this logic without also changing the JavaScript!
 void SSLBlockingPage::CommandReceived(const std::string& command) {
@@ skipping 133 matching lines @@
       !(options_mask & SSLBlockingPage::STRICT_ENFORCEMENT) &&
       profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
   return is_overridable;
 }
 
 // static
 bool SSLBlockingPage::DoesPolicyAllowDangerOverride(
     const Profile* const profile) {
   return profile->GetPrefs()->GetBoolean(prefs::kSSLErrorOverrideAllowed);
 }