Revert of Attach a SecurityStyle to each request in ResourceLoader

content/browser/ssl/ssl_policy.h

 // 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.
 
 #ifndef CONTENT_BROWSER_SSL_SSL_POLICY_H_
 #define CONTENT_BROWSER_SSL_SSL_POLICY_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "content/public/common/resource_type.h"
-#include "content/public/common/security_style.h"
-
-class GURL;
 
 namespace content {
 class NavigationEntryImpl;
 class SSLCertErrorHandler;
 class SSLPolicyBackend;
 class SSLRequestInfo;
-class WebContents;
-struct SSLStatus;
+class WebContentsImpl;
 
 // SSLPolicy
 //
 // This class is responsible for making the security decisions that concern the
 // SSL trust indicators.  It relies on the SSLPolicyBackend to actually enact
 // the decisions it reaches.
 //
 class SSLPolicy {
  public:
   explicit SSLPolicy(SSLPolicyBackend* backend);
 
   // An error occurred with the certificate in an SSL connection.
   void OnCertError(SSLCertErrorHandler* handler);
 
   void DidRunInsecureContent(NavigationEntryImpl* entry,
                              const std::string& security_origin);
 
   // We have started a resource request with the given info.
   void OnRequestStarted(SSLRequestInfo* info);
 
   // Update the SSL information in |entry| to match the current state.
-  // |web_contents| is the WebContents associated with this entry.
-  void UpdateEntry(NavigationEntryImpl* entry, WebContents* web_contents);
+  // |web_contents| is the WebContentsImpl associated with this entry.
+  void UpdateEntry(NavigationEntryImpl* entry,
+                   WebContentsImpl* web_contents);
 
   SSLPolicyBackend* backend() const { return backend_; }
 
-  // Returns a security style describing an individual resource. Does
-  // not take into account any of the page- or host-level state such as
-  // mixed content or whether the host has run insecure content.
-  static SecurityStyle GetSecurityStyleForResource(const GURL& url,
-                                                   const SSLStatus& ssl);
-
  private:
   enum OnCertErrorInternalOptionsMask {
     OVERRIDABLE = 1 << 0,
     STRICT_ENFORCEMENT = 1 << 1,
     EXPIRED_PREVIOUS_DECISION = 1 << 2
   };
 
   // Callback that the user chose to accept or deny the certificate.
   void OnAllowCertificate(scoped_refptr<SSLCertErrorHandler> handler,
                           bool allow);
@@ skipping 19 matching lines @@
 
   // The backend we use to enact our decisions.
   SSLPolicyBackend* backend_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLPolicy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SSL_SSL_POLICY_H_