Mixed Content: Make MixedContentChecker completely static.

Source/core/loader/MixedContentChecker.h

Index: Source/core/loader/MixedContentChecker.h
diff --git a/Source/core/loader/MixedContentChecker.h b/Source/core/loader/MixedContentChecker.h
index 2d81bdca77b9402864d468fa8dbe18982aea8af6..5dcfda388bfbbd9bea6b41d07222cff92805a5b3 100644
--- a/Source/core/loader/MixedContentChecker.h
+++ b/Source/core/loader/MixedContentChecker.h
@@ -45,33 +45,12 @@ class ResourceRequest;
 class MixedContentChecker {
     WTF_MAKE_NONCOPYABLE(MixedContentChecker);
 public:
-    explicit MixedContentChecker(LocalFrame*);
-
-    static bool shouldBlockFetch(LocalFrame*, const ResourceRequest&, const KURL&);
-
-    bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
-    {
-        return canDisplayInsecureContentInternal(securityOrigin, url, MixedContentChecker::Display);
-    }
-
-    bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
-    {
-        return canRunInsecureContentInternal(securityOrigin, url, MixedContentChecker::Execution);
-    }
-
-    bool canSubmitToInsecureForm(SecurityOrigin*, const KURL&) const;
-    bool canConnectInsecureWebSocket(SecurityOrigin*, const KURL&) const;
-    bool canFrameInsecureContent(SecurityOrigin*, const KURL&) const;
+    static bool shouldBlockFetch(LocalFrame*, WebURLRequest::RequestContext, WebURLRequest::FrameType, const KURL&);
+    static bool shouldBlockWebSocket(LocalFrame*, const KURL&);
+    static bool checkFormAction(LocalFrame*, const KURL&);
     static bool isMixedContent(SecurityOrigin*, const KURL&);
 
 private:
-    enum MixedContentType {
-        Display,
-        Execution,
-        WebSocket,
-        Submission
-    };
-
     enum ContextType {
         ContextTypeBlockable,
         ContextTypeOptionallyBlockable,
@@ -79,20 +58,10 @@ private:
         ContextTypeBlockableUnlessLax
     };
 
+    static LocalFrame* inWhichFrameIsThisContentMixed(LocalFrame*, WebURLRequest::RequestContext, 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);
-
-    // FIXME: This should probably have a separate client from FrameLoader.
-    FrameLoaderClient* client() const;
-
-    bool canDisplayInsecureContentInternal(SecurityOrigin*, const KURL&, const MixedContentType) const;
-
-    bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const MixedContentType) const;
-
-    void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
-
-    LocalFrame* m_frame;
 };
 
 } // namespace blink