Adapt MixedContentChecker for remote frames

third_party/WebKit/Source/core/loader/MixedContentChecker.h

Index: third_party/WebKit/Source/core/loader/MixedContentChecker.h
diff --git a/third_party/WebKit/Source/core/loader/MixedContentChecker.h b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
index e2e50c4a13e56500d8aacceb03f1f26210284194..a12196fe14f1efad9c6288fe7102cc71e40feeea 100644
--- a/third_party/WebKit/Source/core/loader/MixedContentChecker.h
+++ b/third_party/WebKit/Source/core/loader/MixedContentChecker.h
@@ -40,6 +40,7 @@
 
 namespace blink {
 
+class Frame;
 class FrameLoaderClient;
 class LocalFrame;
 class KURL;
@@ -75,7 +76,7 @@ public:
 
     // Returns the frame that should be considered the effective frame
     // for a mixed content check for the given frame type.
-    static LocalFrame* effectiveFrameForFrameType(LocalFrame*, WebURLRequest::FrameType);
+    static Frame* effectiveFrameForFrameType(LocalFrame*, WebURLRequest::FrameType);
 
     static void handleCertificateError(LocalFrame*, const ResourceRequest&, const ResourceResponse&);
 
@@ -88,13 +89,13 @@ private:
         Submission
     };
 
-    static LocalFrame* inWhichFrameIsContentMixed(LocalFrame*, WebURLRequest::FrameType, const KURL&);
+    static Frame* inWhichFrameIsContentMixed(Frame*, WebURLRequest::FrameType, const KURL&);
 
-    static ContextType contextTypeFromContext(WebURLRequest::RequestContext, LocalFrame*);
+    static ContextType contextTypeFromContext(WebURLRequest::RequestContext, Frame*);
     static const char* typeNameFromContext(WebURLRequest::RequestContext);
-    static void logToConsoleAboutFetch(LocalFrame*, const KURL&, WebURLRequest::RequestContext, bool allowed);
-    static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, bool allowed);
-    static void count(LocalFrame*, WebURLRequest::RequestContext);
+    static void logToConsoleAboutFetch(LocalFrame*, const KURL&, const KURL&, WebURLRequest::RequestContext, bool allowed);
+    static void logToConsoleAboutWebSocket(LocalFrame*, const KURL&, const KURL&, bool allowed);
+    static void count(Frame*, WebURLRequest::RequestContext);
 };
 
 } // namespace blink