PlzNavigate: Move navigation-level mixed content checks to the browser.

third_party/WebKit/Source/platform/exported/WebMixedContent.cpp

Index: third_party/WebKit/Source/platform/exported/WebMixedContent.cpp
diff --git a/third_party/WebKit/Source/platform/exported/WebMixedContent.cpp b/third_party/WebKit/Source/platform/exported/WebMixedContent.cpp
index d2d36418504951e4047f9f5e8ad71659fcf88734..f572535aaf15205d49bb9960ad00cafdc0c63a6c 100644
--- a/third_party/WebKit/Source/platform/exported/WebMixedContent.cpp
+++ b/third_party/WebKit/Source/platform/exported/WebMixedContent.cpp
@@ -33,7 +33,7 @@
 namespace blink {
 
 // static
-WebMixedContent::ContextType WebMixedContent::contextTypeFromRequestContext(
+WebMixedContentContextType WebMixedContent::contextTypeFromRequestContext(
     WebURLRequest::RequestContext context,
     bool strictMixedContentCheckingForPlugin) {
   switch (context) {
@@ -42,13 +42,13 @@ WebMixedContent::ContextType WebMixedContent::contextTypeFromRequestContext(
     case WebURLRequest::RequestContextFavicon:
     case WebURLRequest::RequestContextImage:
     case WebURLRequest::RequestContextVideo:
-      return ContextType::OptionallyBlockable;
+      return WebMixedContentContextType::OptionallyBlockable;
 
     // Plugins! Oh how dearly we love plugin-loaded content!
     case WebURLRequest::RequestContextPlugin: {
       return strictMixedContentCheckingForPlugin
-                 ? ContextType::Blockable
-                 : ContextType::OptionallyBlockable;
+                 ? WebMixedContentContextType::Blockable
+                 : WebMixedContentContextType::OptionallyBlockable;
     }
 
     // "Blockable" mixed content
@@ -78,96 +78,19 @@ WebMixedContent::ContextType WebMixedContent::contextTypeFromRequestContext(
     case WebURLRequest::RequestContextWorker:
     case WebURLRequest::RequestContextXMLHttpRequest:
     case WebURLRequest::RequestContextXSLT:
-      return ContextType::Blockable;
+      return WebMixedContentContextType::Blockable;
 
     // FIXME: Contexts that we should block, but don't currently.
     // https://crbug.com/388650
     case WebURLRequest::RequestContextDownload:
     case WebURLRequest::RequestContextPrefetch:
-      return ContextType::ShouldBeBlockable;
+      return WebMixedContentContextType::ShouldBeBlockable;
 
     case WebURLRequest::RequestContextUnspecified:
       NOTREACHED();
   }
   NOTREACHED();
-  return ContextType::Blockable;
-}
-
-// static
-const char* WebMixedContent::requestContextName(
-    WebURLRequest::RequestContext context) {
-  switch (context) {
-    case WebURLRequest::RequestContextAudio:
-      return "audio file";
-    case WebURLRequest::RequestContextBeacon:
-      return "Beacon endpoint";
-    case WebURLRequest::RequestContextCSPReport:
-      return "Content Security Policy reporting endpoint";
-    case WebURLRequest::RequestContextDownload:
-      return "download";
-    case WebURLRequest::RequestContextEmbed:
-      return "plugin resource";
-    case WebURLRequest::RequestContextEventSource:
-      return "EventSource endpoint";
-    case WebURLRequest::RequestContextFavicon:
-      return "favicon";
-    case WebURLRequest::RequestContextFetch:
-      return "resource";
-    case WebURLRequest::RequestContextFont:
-      return "font";
-    case WebURLRequest::RequestContextForm:
-      return "form action";
-    case WebURLRequest::RequestContextFrame:
-      return "frame";
-    case WebURLRequest::RequestContextHyperlink:
-      return "resource";
-    case WebURLRequest::RequestContextIframe:
-      return "frame";
-    case WebURLRequest::RequestContextImage:
-      return "image";
-    case WebURLRequest::RequestContextImageSet:
-      return "image";
-    case WebURLRequest::RequestContextImport:
-      return "HTML Import";
-    case WebURLRequest::RequestContextInternal:
-      return "resource";
-    case WebURLRequest::RequestContextLocation:
-      return "resource";
-    case WebURLRequest::RequestContextManifest:
-      return "manifest";
-    case WebURLRequest::RequestContextObject:
-      return "plugin resource";
-    case WebURLRequest::RequestContextPing:
-      return "hyperlink auditing endpoint";
-    case WebURLRequest::RequestContextPlugin:
-      return "plugin data";
-    case WebURLRequest::RequestContextPrefetch:
-      return "prefetch resource";
-    case WebURLRequest::RequestContextScript:
-      return "script";
-    case WebURLRequest::RequestContextServiceWorker:
-      return "Service Worker script";
-    case WebURLRequest::RequestContextSharedWorker:
-      return "Shared Worker script";
-    case WebURLRequest::RequestContextStyle:
-      return "stylesheet";
-    case WebURLRequest::RequestContextSubresource:
-      return "resource";
-    case WebURLRequest::RequestContextTrack:
-      return "Text Track";
-    case WebURLRequest::RequestContextUnspecified:
-      return "resource";
-    case WebURLRequest::RequestContextVideo:
-      return "video";
-    case WebURLRequest::RequestContextWorker:
-      return "Worker script";
-    case WebURLRequest::RequestContextXMLHttpRequest:
-      return "XMLHttpRequest endpoint";
-    case WebURLRequest::RequestContextXSLT:
-      return "XSLT";
-  }
-  NOTREACHED();
-  return "resource";
+  return WebMixedContentContextType::Blockable;
 }
 
 }  // namespace blink