Mixed Content: Add a static check for WebSockets.

Source/core/loader/MixedContentChecker.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 36 matching lines @@
     WTF_MAKE_NONCOPYABLE(MixedContentChecker);
     DISALLOW_ALLOCATION();
 public:
     enum ReportingStatus { SendReport, SuppressReport };
     static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&, ReportingStatus = SendReport);
     static bool shouldBlockFetch(LocalFrame* frame, const ResourceRequest& request, const KURL& url, ReportingStatus status = SendReport)
     {
         return shouldBlockFetch(frame, request.requestContext(), request.frameType(), url, status);
     }
 
+    static bool shouldBlockConnection(LocalFrame*, const KURL&, ReportingStatus = SendReport);
+
     static bool isMixedContent(SecurityOrigin*, const KURL&);
 
     static void checkMixedPrivatePublic(LocalFrame*, const AtomicString& resourceIPAddress);
 
     // FIXME: Get rid of these non-static bits. https://crbug.com/305811
     explicit MixedContentChecker(LocalFrame*);
     bool canSubmitToInsecureForm(SecurityOrigin*, const KURL&) const;
-    bool canConnectInsecureWebSocket(SecurityOrigin*, const KURL&) const;
     void trace(Visitor*);
 
 private:
     enum MixedContentType {
         Display,
         Execution,
         WebSocket,
         Submission
     };
 
     enum ContextType {
         ContextTypeBlockable,
         ContextTypeOptionallyBlockable,
         ContextTypeShouldBeBlockable,
     };
 
+    static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::FrameType, const KURL&);
+
     static ContextType contextTypeFromContext(WebURLRequest::RequestContext);
     static const char* typeNameFromContext(WebURLRequest::RequestContext);
     static void logToConsole(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
     static void count(LocalFrame*, WebURLRequest::RequestContext);
 
     // FIXME: Get rid of these non-static bits. https://crbug.com/305811
     FrameLoaderClient* client() const;
     bool canDisplayInsecureContent(SecurityOrigin*, const KURL&, const MixedContentType) const;
-    bool canRunInsecureContent(SecurityOrigin*, const KURL&, const MixedContentType) const;
     void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
 
     RawPtrWillBeMember<LocalFrame> m_frame;
 };
 
 } // namespace blink
 
 #endif // MixedContentChecker_h