Add BlockedReason::content-type to browser_protocol.pdl.

This way, entries correspond with ResourceRequestBlockedReason.
Also sort entries more logically and update BuildBlockedReason.
Missing content-type is probably a bug / oversight.

Change-Id: I3091d5ec5cd85b0cd51dc8e637c9665bd3bc7448
Reviewed-on: https://chromium-review.googlesource.com/1043388Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555983}

third_party/blink/renderer/core/inspector/browser_protocol.pdl

@@ -3461,6 +3461,7 @@ domain Network
       origin
       inspector
       subresource-filter
+      content-type
       other
 
   # HTTP response data.

third_party/blink/renderer/core/inspector/inspector_network_agent.cc

@@ -349,6 +349,9 @@ String ResourcePriorityJSON(ResourceLoadPriority priority) {
 
 String BuildBlockedReason(ResourceRequestBlockedReason reason) {
   switch (reason) {
+    case ResourceRequestBlockedReason::kNone:
+      NOTREACHED();
+      return protocol::Network::BlockedReasonEnum::Other;
     case ResourceRequestBlockedReason::kCSP:
       return protocol::Network::BlockedReasonEnum::Csp;
     case ResourceRequestBlockedReason::kMixedContent:
@@ -359,13 +362,13 @@ String BuildBlockedReason(ResourceRequestBlockedReason reason) {
       return protocol::Network::BlockedReasonEnum::Inspector;
     case ResourceRequestBlockedReason::kSubresourceFilter:
       return protocol::Network::BlockedReasonEnum::SubresourceFilter;
+    case ResourceRequestBlockedReason::kContentType:
+      return protocol::Network::BlockedReasonEnum::ContentType;
     case ResourceRequestBlockedReason::kOther:
       return protocol::Network::BlockedReasonEnum::Other;
-    case ResourceRequestBlockedReason::kNone:
-    default:
-      NOTREACHED();
-      return protocol::Network::BlockedReasonEnum::Other;
   }
+  NOTREACHED();
+  return protocol::Network::BlockedReasonEnum::Other;
 }
 
 WebConnectionType ToWebConnectionType(const String& connection_type) {

third_party/blink/renderer/devtools/front_end/network/NetworkDataGridNode.js

@@ -855,6 +855,12 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
         case Protocol.Network.BlockedReason.Inspector:
           reason = Common.UIString('devtools');
           break;
+        case Protocol.Network.BlockedReason.SubresourceFilter:
+          reason = Common.UIString('subresource-filter');
+          break;
+        case Protocol.Network.BlockedReason.ContentType:
+          reason = Common.UIString('content-type');
+          break;
         case Protocol.Network.BlockedReason.Other:
           reason = Common.UIString('other');
           break;

third_party/blink/renderer/platform/loader/fetch/resource_request.h

@@ -48,15 +48,19 @@
 
 namespace blink {
 
+// NOTE: If updating this enum, also update
+//       BuildResourceRequestReason in inspector_network_agent.cc and
+//       BlockedReasonEnum in browser_protocol.pdl and
+//       Network.NetworkRequestNode in NetworkDataGridNode.js.
 enum class ResourceRequestBlockedReason {
+  kNone,
   kCSP,
   kMixedContent,
   kOrigin,
   kInspector,
   kSubresourceFilter,
-  kOther,
   kContentType,
-  kNone
+  kOther,
 };
 
 enum InputToLoadPerfMetricReportPolicy : uint8_t {