Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..."

Source/core/loader/PingLoader.cpp

Index: Source/core/loader/PingLoader.cpp
===================================================================
--- Source/core/loader/PingLoader.cpp	(revision 182628)
+++ Source/core/loader/PingLoader.cpp	(working copy)
@@ -40,7 +40,6 @@
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
-#include "core/loader/MixedContentChecker.h"
 #include "core/loader/UniqueIdentifier.h"
 #include "core/page/Page.h"
 #include "platform/exported/WrappedResourceRequest.h"
@@ -122,7 +121,7 @@
 
 void PingLoader::start(LocalFrame* frame, ResourceRequest& request, const FetchInitiatorInfo& initiatorInfo, StoredCredentials credentialsAllowed)
 {
-    if (MixedContentChecker::shouldBlockFetch(frame, request.requestContext(), request.frameType(), request.url()))
+    if (!frame->loader().mixedContentChecker()->canRunInsecureContent(frame->document()->securityOrigin(), request.url()))
         return;
 
     OwnPtr<PingLoader> pingLoader = adoptPtr(new PingLoader(frame, request, initiatorInfo, credentialsAllowed));