Replicate WebInsecureRequestPolicy instead of a bool for strict mixed content checks.

third_party/WebKit/Source/web/WebFrame.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "public/web/WebFrame.h"
 
 #include "bindings/core/v8/WindowProxyManager.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/Page.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrameOwnerProperties.h"
 #include "public/web/WebSandboxFlags.h"
 #include "web/OpenedFrameTracker.h"
 #include "web/RemoteFrameOwner.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include <algorithm>
 
 namespace blink {
@@ skipping 95 matching lines @@
 
 void WebFrame::setFrameOwnerSandboxFlags(WebSandboxFlags flags)
 {
     // At the moment, this is only used to replicate sandbox flags
     // for frames with a remote owner.
     FrameOwner* owner = toImplBase()->frame()->owner();
     DCHECK(owner);
     toRemoteFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(flags));
 }
 
-bool WebFrame::shouldEnforceStrictMixedContentChecking() const
+WebInsecureRequestPolicy WebFrame::getInsecureRequestPolicy() const
 {
-    return toImplBase()->frame()->securityContext()->getInsecureRequestPolicy() & kBlockAllMixedContent;
+    return toImplBase()->frame()->securityContext()->getInsecureRequestPolicy();
 }
 
 void WebFrame::setFrameOwnerProperties(const WebFrameOwnerProperties& properties)
 {
     // At the moment, this is only used to replicate frame owner properties
     // for frames with a remote owner.
     RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner());
     DCHECK(owner);
     owner->setScrollingMode(properties.scrollingMode);
     owner->setMarginWidth(properties.marginWidth);
@@ skipping 227 matching lines @@
     void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { traceFrameImpl(visitor, frame); }                  \
     void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { traceFramesImpl(visitor, frame); }                \
     void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesImpl(visitor); }
 
 DEFINE_VISITOR_METHOD(Visitor*)
 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor)
 
 #undef DEFINE_VISITOR_METHOD
 
 } // namespace blink