Revert "Mixed Content: Make MixedContentChecker completely static."

Source/modules/websockets/MainThreadWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 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 76 matching lines @@
 MainThreadWebSocketChannel::~MainThreadWebSocketChannel()
 {
 }
 
 bool MainThreadWebSocketChannel::connect(const KURL& url, const String& protocol)
 {
     WTF_LOG(Network, "MainThreadWebSocketChannel %p connect()", this);
     ASSERT(!m_handle);
     ASSERT(!m_suspended);
 
-    if (MixedContentChecker::shouldBlockWebSocket(m_document->frame(), url))
+    if (m_document->frame() && !m_document->frame()->loader().mixedContentChecker()->canConnectInsecureWebSocket(m_document->securityOrigin(), url))
         return false;
     if (MixedContentChecker::isMixedContent(m_document->securityOrigin(), url)) {
         String message = "Connecting to a non-secure WebSocket server from a secure origin is deprecated.";
         m_document->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, message));
     }
 
     m_handshake = new WebSocketHandshake(url, protocol, m_document);
     m_handshake->reset();
     m_handshake->addExtensionProcessor(m_perMessageDeflate.createExtensionProcessor());
     m_handshake->addExtensionProcessor(m_deflateFramer.createExtensionProcessor());
@@ skipping 748 matching lines @@
 {
     visitor->trace(m_document);
     visitor->trace(m_client);
     visitor->trace(m_handshake);
     visitor->trace(m_handle);
     WebSocketChannel::trace(visitor);
     SocketStreamHandleClient::trace(visitor);
 }
 
 } // namespace blink