Remove SSLStatus::security_style member and content::SecurityStyle

content/browser/ssl/ssl_manager.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 "content/browser/ssl/ssl_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/supports_user_data.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/browser/web_contents/web_contents_impl.h"
-#include "content/common/security_style_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 #include "content/public/browser/ssl_status.h"
 #include "net/url_request/url_request.h"
 
 namespace content {
@@ skipping 306 matching lines @@
                  ssl_host_state_delegate_));
 }
 
 void SSLManager::UpdateEntry(NavigationEntryImpl* entry) {
   // We don't always have a navigation entry to update, for example in the
   // case of the Web Inspector.
   if (!entry)
     return;
 
   SSLStatus original_ssl_status = entry->GetSSL();  // Copy!
-
-  // Initialize the entry with an initial SecurityStyle if needed.
-  if (entry->GetSSL().security_style == SECURITY_STYLE_UNKNOWN) {
-    entry->GetSSL().security_style = GetSecurityStyleForResource(
-        entry->GetURL(), !!entry->GetSSL().certificate,
-        entry->GetSSL().cert_status);
-  }
+  entry->GetSSL().initialized = true;
 
   WebContentsImpl* web_contents_impl =
       static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
 
   // For sensitive inputs (password, credit card) on HTTP, do not clear
   // the |content_status| flag when the WebContents no longer has the
   // flag set. This is different from how DISPLAYED_INSECURE_CONTENT and
   // DISPLAYED_CONTENT_WITH_CERT_ERRORS are handled below. For sensitive
   // inputs on HTTP, once the NavigationEntry has been marked as having
   // displayed a sensitive input, it stays that way, even if the
   // sensitive input is subsequently removed from the page.
   if (web_contents_impl->DisplayedPasswordFieldOnHttp()) {
     entry->GetSSL().content_status |=
         SSLStatus::DISPLAYED_PASSWORD_FIELD_ON_HTTP;
   }
 
   if (web_contents_impl->DisplayedCreditCardFieldOnHttp()) {
     entry->GetSSL().content_status |=
         SSLStatus::DISPLAYED_CREDIT_CARD_FIELD_ON_HTTP;
   }
 
-  if (entry->GetSSL().security_style == SECURITY_STYLE_UNAUTHENTICATED)
+  // Do not record information about insecure subresources if the main
+  // page is HTTP or HTTPS without a certificate.
+  if (!entry->GetURL().SchemeIsCryptographic() || !entry->GetSSL().certificate)
     return;
 
   // Update the entry's flags for insecure content.
   if (!web_contents_impl->DisplayedInsecureContent())
     entry->GetSSL().content_status &= ~SSLStatus::DISPLAYED_INSECURE_CONTENT;
   if (web_contents_impl->DisplayedInsecureContent())
     entry->GetSSL().content_status |= SSLStatus::DISPLAYED_INSECURE_CONTENT;
   if (!web_contents_impl->DisplayedContentWithCertErrors()) {
     entry->GetSSL().content_status &=
         ~SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS;
   }
   if (web_contents_impl->DisplayedContentWithCertErrors()) {
     entry->GetSSL().content_status |=
         SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS;
   }
 
   SiteInstance* site_instance = entry->site_instance();
   // Note that |site_instance| can be NULL here because NavigationEntries don't
   // necessarily have site instances.  Without a process, the entry can't
   // possibly have insecure content.  See bug http://crbug.com/12423.
   if (site_instance && ssl_host_state_delegate_ &&
       ssl_host_state_delegate_->DidHostRunInsecureContent(
           entry->GetURL().host(), site_instance->GetProcess()->GetID(),
           SSLHostStateDelegate::MIXED_CONTENT)) {
-    entry->GetSSL().security_style = SECURITY_STYLE_AUTHENTICATION_BROKEN;
     entry->GetSSL().content_status |= SSLStatus::RAN_INSECURE_CONTENT;
   }
 
   if (site_instance && ssl_host_state_delegate_ &&
       ssl_host_state_delegate_->DidHostRunInsecureContent(
           entry->GetURL().host(), site_instance->GetProcess()->GetID(),
           SSLHostStateDelegate::CERT_ERRORS_CONTENT)) {
-    entry->GetSSL().security_style = SECURITY_STYLE_AUTHENTICATION_BROKEN;
     entry->GetSSL().content_status |= SSLStatus::RAN_CONTENT_WITH_CERT_ERRORS;
   }
 
   if (!entry->GetSSL().Equals(original_ssl_status))
     NotifyDidChangeVisibleSSLState();
 }
 
 void SSLManager::NotifyDidChangeVisibleSSLState() {
   WebContentsImpl* contents =
       static_cast<WebContentsImpl*>(controller_->delegate()->GetWebContents());
   contents->DidChangeVisibleSSLState();
 }
 
 }  // namespace content