Index: content/child/web_url_request_util.cc |
diff --git a/content/child/web_url_request_util.cc b/content/child/web_url_request_util.cc |
index 606583175cb18c7d8f4ea871c2c7da10d1840a42..b68b1c7d052086ded0a5a06a91ad3efb49b139fb 100644 |
--- a/content/child/web_url_request_util.cc |
+++ b/content/child/web_url_request_util.cc |
@@ -18,6 +18,8 @@ |
#include "third_party/WebKit/public/platform/WebCachePolicy.h" |
#include "third_party/WebKit/public/platform/WebData.h" |
#include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" |
+#include "third_party/WebKit/public/platform/WebMixedContent.h" |
+#include "third_party/WebKit/public/platform/WebMixedContentContextType.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
#include "third_party/WebKit/public/platform/WebURL.h" |
#include "third_party/WebKit/public/platform/WebURLError.h" |
@@ -471,6 +473,19 @@ RequestContextType GetRequestContextTypeForWebURLRequest( |
return static_cast<RequestContextType>(request.getRequestContext()); |
} |
+blink::WebMixedContentContextType GetMixedContentContextTypeForWebURLRequest( |
+ const blink::WebURLRequest& request) { |
+ bool block_mixed_plugin_content = false; |
+ if (request.getExtraData()) { |
+ RequestExtraData* extra_data = |
+ static_cast<RequestExtraData*>(request.getExtraData()); |
+ block_mixed_plugin_content = extra_data->block_mixed_plugin_content(); |
+ } |
+ |
+ return blink::WebMixedContent::contextTypeFromRequestContext( |
+ request.getRequestContext(), block_mixed_plugin_content); |
+} |
+ |
STATIC_ASSERT_ENUM(SkipServiceWorker::NONE, |
WebURLRequest::SkipServiceWorker::None); |
STATIC_ASSERT_ENUM(SkipServiceWorker::CONTROLLING, |