Remove SecurityStateModel memoization

components/security_state/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 "components/security_state/security_state_model.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 275 matching lines @@
       key_exchange_group(0),
       obsolete_ssl_status(net::OBSOLETE_SSL_NONE),
       pkp_bypassed(false) {}
 
 SecurityStateModel::SecurityInfo::~SecurityInfo() {}
 
 SecurityStateModel::SecurityStateModel() {}
 
 SecurityStateModel::~SecurityStateModel() {}
 
-const SecurityStateModel::SecurityInfo& SecurityStateModel::GetSecurityInfo()
-    const {
+void SecurityStateModel::GetSecurityInfo(
+    SecurityStateModel::SecurityInfo* result) const {
   scoped_refptr<net::X509Certificate> cert = nullptr;
   client_->RetrieveCert(&cert);
 
-  // Check if the cached |security_info_| must be recomputed.
   VisibleSecurityState new_visible_state;
   client_->GetVisibleSecurityState(&new_visible_state);
-  bool visible_security_state_changed =
-      !(visible_security_state_ == new_visible_state);
-  if (!visible_security_state_changed) {
-    // A cert must be present in order for the site to be considered
-    // EV_SECURE, and the cert might have been removed since the
-    // security level was last computed.
-    if (security_info_.security_level == EV_SECURE && !cert) {
-      security_info_.security_level = SECURE;
-    }
-    return security_info_;
-  }
-
-  visible_security_state_ = new_visible_state;
-  SecurityInfoForRequest(client_, visible_security_state_, cert,
-                         &security_info_);
-  return security_info_;
+  SecurityInfoForRequest(client_, new_visible_state, cert, result);
 }
 
 void SecurityStateModel::SetClient(SecurityStateModelClient* client) {
   client_ = client;
 }
 
 SecurityStateModel::VisibleSecurityState::VisibleSecurityState()
     : initial_security_level(SecurityStateModel::NONE),
       fails_malware_check(false),
       connection_info_initialized(false),
@@ skipping 28 matching lines @@
               other.displayed_content_with_cert_errors &&
           ran_content_with_cert_errors == other.ran_content_with_cert_errors &&
           pkp_bypassed == other.pkp_bypassed &&
           displayed_password_field_on_http ==
               other.displayed_password_field_on_http &&
           displayed_credit_card_field_on_http ==
               other.displayed_credit_card_field_on_http);
 }
 
 }  // namespace security_state