Revert of Implementing mixed content for forms posting to insecure location from secure ones

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 27 matching lines @@
 class LocalFrame;
 class FrameLoaderClient;
 class KURL;
 class SecurityOrigin;
 
 class MixedContentChecker {
     WTF_MAKE_NONCOPYABLE(MixedContentChecker);
 public:
     MixedContentChecker(LocalFrame*);
 
-    bool canDisplayInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
-    {
-        return canDisplayInsecureContentInternal(securityOrigin, url, MixedContentChecker::Display);
-    }
-    bool canSubmitToInsecureForm(SecurityOrigin* securityOrigin, const KURL& url) const
-    {
-        return canDisplayInsecureContentInternal(securityOrigin, url, MixedContentChecker::Submission);
-    }
-
+    bool canDisplayInsecureContent(SecurityOrigin*, const KURL&) const;
     bool canRunInsecureContent(SecurityOrigin* securityOrigin, const KURL& url) const
     {
-        return canRunInsecureContentInternal(securityOrigin, url, MixedContentChecker::Execution);
+        return canRunInsecureContentInternal(securityOrigin, url, false);
     }
     bool canConnectInsecureWebSocket(SecurityOrigin* securityOrigin, const KURL& url) const
     {
-        return canRunInsecureContentInternal(securityOrigin, url, MixedContentChecker::WebSocket);
+        return canRunInsecureContentInternal(securityOrigin, url, true);
     }
     static bool isMixedContent(SecurityOrigin*, const KURL&);
 
 private:
-    enum MixedContentType {
-        Display,
-        Execution,
-        WebSocket,
-        Submission
-    };
-
     // 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&, bool isWebSocket) const;
 
-    bool canRunInsecureContentInternal(SecurityOrigin*, const KURL&, const MixedContentType) const;
-
-    void logWarning(bool allowed, const KURL& i, const MixedContentType) const;
+    void logWarning(bool allowed, const String& action, const KURL&) const;
 
     LocalFrame* m_frame;
 };
 
 } // namespace WebCore
 
 #endif // MixedContentChecker_h