Revert of Attach a SecurityStyle to each request in ResourceLoader (patchset #9 id:160001 of https://codereview.chromium.org/1244863003/)

Reason for revert:
SecurityStyleChanged browser test is flaky after this change: http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests

Original issue's description:
> Attach a SecurityStyle to each request in ResourceLoader
>
> This CL adds a SecurityStyle to the serialized security information that
> is sent with each request from the browser to the renderer. The
> SecurityStyle describes the individual resource, not any bigger-picture
> concerns like mixed content. The per-request SecurityStyle will be
> displayed in DevTools to help developers diagnose SSL issues on
> subresources.
>
> BUG=502118, 445234
>
> Committed: https://crrev.com/5318895a4dd623caf5d152461684935c6e874e12
> Cr-Commit-Position: refs/heads/master@{#340762}

TBR=creis@chromium.org,davidben@chromium.org,palmer@chromium.org,msw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=502118, 445234

Review URL: https://codereview.chromium.org/1259253009

Cr-Commit-Position: refs/heads/master@{#340785}

1 files changed, 4 insertions, 13 deletions

diff --git a/content/browser/ssl/ssl_policy.h b/content/browser/ssl/ssl_policy.h
index 8998d1f..78dbb6d 100644
--- a/content/browser/ssl/ssl_policy.h
+++ b/content/browser/ssl/ssl_policy.h
@@ -9,17 +9,13 @@
 
 #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
 //
@@ -41,17 +37,12 @@ class SSLPolicy {
   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,