Re-land: Only allow HTTP/0.9 support on default ports.

components/policy/resources/policy_templates.json

Index: components/policy/resources/policy_templates.json
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index ec19b558c618d8f5bb1866c7525676abfcc7bf29..f39310e5362e201b1c64572150552e4dd1663a83 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -137,7 +137,7 @@
 #   persistent IDs for all fields (but not for groups!) are needed. These are
 #   specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
 #   because doing so would break the deployed wire format!
-#   For your editing convenience: highest ID currently used: 344
+#   For your editing convenience: highest ID currently used: 345
 #
 # Placeholders:
 #   The following placeholder strings are automatically substituted:
@@ -520,6 +520,27 @@
       'label': '''List of disabled protocol schemes''',
     },
     {
+      'name': 'Http09OnNonDefaultPortsEnabled',
+      'type': 'main',
+      'schema': { 'type': 'boolean' },
+      'supported_on': ['chrome.*:54-', 'chrome_os:54-'],
+      'features': {
+        'dynamic_refresh': False,
+        'per_profile': False,
+      },
+      'example_value': False,
+      'id': 345,
+      'caption': '''Enables HTTP/0.9 support on non-default ports''',
+      'tags': [],
+      'desc': '''This policy enables HTTP/0.9 on ports other than 80 for HTTP and 443 for HTTPS.
+
+      This policy is disabled by default, and if enabled, leaves users open to the security issue https://crbug.com/600352.
+
+      This policy is intended to give enterprises a chance to migrate exising servers off of HTTP/0.9, and will be removed in the future.
+
+      If this policy is not set, HTTP/0.9 will be disabled on non-default ports.''',
+    },
+    {
       'name': 'JavascriptEnabled',
       'type': 'main',
       'schema': { 'type': 'boolean' },