[Extensions] Update features.json file to use [allow|block]list

Update the various features.json files
(_[api|manifest|permission|behavior]_features.json) to use
allowlist and blocklist terminology.

Bug: 842387
Change-Id: I3e165efd2415b21275df06f5f67a944330474ffd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2606784
Auto-Submit: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Luke Halliwell (slow) <halliwell@chromium.org>
Reviewed-by: Matt Giuca <mgiuca@chromium.org>
Commit-Queue: Matt Giuca <mgiuca@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843979}

chrome/common/apps/platform_apps/api/_permission_features.json

@@ -10,7 +10,7 @@
   "arcAppsPrivate": {
     "channel": "stable",
     "extension_types": ["platform_app"],
-    "whitelist": [
+    "allowlist": [
       "46578A13607D38F1DC8E280C4F499FB0A2F9565C", // http://crbug.com/819404
       "898FB5A39687D210766B8998BA4530B99C9E6586", // http://crbug.com/819404
       "82F30B65397BC3E4ADE627BBD857AB8A58210648", // http://crbug.com/819404
@@ -56,7 +56,7 @@
   "musicManagerPrivate": {
     "channel": "stable",
     "extension_types": ["platform_app"],
-    "whitelist": [
+    "allowlist": [
       "4B1D0E19C6C43C008C44A8278C8B5BFE15ABEB3C", // Music Manager
       "B8F61FD1B25DE03706DBB8906A73261E4DBB992A", // Test
       "F7FA7ABC1ECB89BA8EE6656847EFABBF43BB9BCA",
@@ -78,7 +78,7 @@
     "channel": "stable",
     "extension_types": ["platform_app"],
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "A948368FC53BE437A55FEB414106E207925482F5",  // Files app
       "8C726564C6DBE7380BAB388DE6CC7EC93EB44B06",  // Video player
       "5065C83E84321221675D20FBE4DC43C655CC8C6F"   // Files app tests

chrome/common/extensions/api/_api_features.json

@@ -27,7 +27,7 @@
     "dependencies": [],
     "extension_types": ["platform_app"],
     "session_types": ["kiosk"],
-    "whitelist": [
+    "allowlist": [
        "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB",  // http://crbug.com/717501
        "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/717501
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/717501
@@ -45,7 +45,7 @@
     "dependencies": [],
     "extension_types": ["platform_app"],
     "session_types": ["kiosk"],
-    "whitelist": [
+    "allowlist": [
        "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB",  // http://crbug.com/717501
        "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/717501
        "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/717501
@@ -72,7 +72,7 @@
     ]
   }],
   "app": {
-    "blacklist": [
+    "blocklist": [
       "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
       "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
       "12E618C3C6E97495AAECF2AC12DEB082353241C6",  // QO component extension
@@ -157,7 +157,7 @@
     "dependencies": ["manifest:browser_action"],
     "contexts": ["blessed_extension"]
   },
-  // This API is whitelisted on stable and should not be enabled for a wider
+  // This API is allowlisted on stable and should not be enabled for a wider
   // audience without resolving security issues raised in API proposal and
   // review (https://codereview.chromium.org/25305002).
   "browserAction.openPopup": [{
@@ -167,10 +167,10 @@
   }, {
     "channel": "stable",
     "dependencies": ["manifest:browser_action"],
-    "whitelist": [
+    "allowlist": [
       "63ED55E43214C211F82122ED56407FF1A807F2A3",  // Dev
       // The extensions below here only use openPopup on a user action,
-      // so are safe, and can be removed when the whitelist on that
+      // so are safe, and can be removed when the allowlist on that
       // capability is lifted. See crbug.com/436489 for context.
       "A4577D8C2AF4CF26F40CBCA83FFA4251D6F6C8F8",  // http://crbug.com/497301
       "A8208CCC87F8261AFAEB6B85D5E8D47372DDEA6B",  // http://crbug.com/497301
@@ -290,7 +290,7 @@
   }, {
     "channel": "stable",
     "contexts": ["blessed_extension"],
-    "whitelist": [
+    "allowlist": [
       "B44D08FD98F1523ED5837D78D0A606EA9D6206E5"  // Web Store
     ]
   }],
@@ -307,7 +307,7 @@
     "contexts": ["blessed_extension"]
   }, {
     "dependencies": ["permission:desktopCapturePrivate"],
-    "whitelist": [
+    "allowlist": [
       "63ED55E43214C211F82122ED56407FF1A807F2A3",  // Media Router Dev
       "226CF815E39A363090A1E547D53063472B8279FA"   // Media Router Stable
     ],
@@ -429,7 +429,7 @@
       "channel": "stable",
       "contexts": ["blessed_extension"],
       "extension_types": ["platform_app"],
-      "whitelist": [
+      "allowlist": [
         "A948368FC53BE437A55FEB414106E207925482F5"  // File manager
       ],
       "disallow_for_service_workers": true
@@ -902,7 +902,7 @@
   },
   "webrtcLoggingPrivate.getLogsDirectory": {
     "component_extensions_auto_granted": false,
-    "whitelist": [
+    "allowlist": [
       // Extension used for API test.
       "ADFA45434ABA2F1A4647E673F53FF37F8F6047A3",
       "4F25792AF1AA7483936DE29C07806F203C7170A0",  // http://crbug.com/775961

chrome/common/extensions/api/_manifest_features.json

@@ -47,7 +47,7 @@
   }, {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"],
-    "whitelist": [ "2FCBCE08B34CCA1728A85F1EFBD9A34DD2558B2E" ]
+    "allowlist": [ "2FCBCE08B34CCA1728A85F1EFBD9A34DD2558B2E" ]
   }],
   "browser_action": {
     "channel": "stable",
@@ -105,7 +105,7 @@
     {
       "channel": "stable",
       "extension_types": ["legacy_packaged_app", "platform_app"],
-      "whitelist": [
+      "allowlist": [
         "64291898C201DAF15B090EC4B9EC270BEB6BE6FF",
         "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/453955
         "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/453955
@@ -123,7 +123,7 @@
     {
       "channel": "stable",
       "extension_types": ["legacy_packaged_app", "platform_app"],
-      "whitelist": [
+      "allowlist": [
         "64291898C201DAF15B090EC4B9EC270BEB6BE6FF",
         "07BD6A765FFC289FF755D7CAB2893A40EC337FEC",  // http://crbug.com/453955
         "896B85CC7E913E11C34892C1425A093C0701D386",  // http://crbug.com/453955
@@ -147,7 +147,7 @@
     "channel": "stable",
     "extension_types": ["legacy_packaged_app"],
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "0EA6B717932AD64C469C1CCB6911457733295907",  // http://crbug.com/673004
       "58B0C2968C335964D5433E89CA4D86628A0E3D4B"   // http://crbug.com/673004
     ]
@@ -226,9 +226,9 @@
     },
     {
       "channel": "stable",
-      "whitelist": [
+      "allowlist": [
         "F29716B08705C9D3C12CDFE3F638BAE709570C31",  // browser_tests
-        // See crbug.com/245730 for details on the Hangouts whitelist.
+        // See crbug.com/245730 for details on the Hangouts allowlist.
         "53041A2FA309EECED01FFC751E7399186E860B2C",  // Hangouts
         "312745D9BF916161191143F6490085EEA0434997",  // Hangouts beta
         "A74A4D44C7CFCD8844830E6140C8D763E12DD8F3",  // Hangouts alpha

chromecast/common/extensions_api/_api_features.json

@@ -44,7 +44,7 @@
       "channel": "stable",
       "contexts": ["blessed_extension"],
       "extension_types": ["platform_app"],
-      "whitelist": [
+      "allowlist": [
         "A948368FC53BE437A55FEB414106E207925482F5"  // File manager
       ]
     }

chromecast/common/extensions_api/_manifest_features.json

@@ -10,7 +10,7 @@
   }, {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app"],
-    "whitelist": [ "2FCBCE08B34CCA1728A85F1EFBD9A34DD2558B2E" ]
+    "allowlist": [ "2FCBCE08B34CCA1728A85F1EFBD9A34DD2558B2E" ]
   }],
   "cast_redirect": {
     "channel": "stable",

chromecast/common/extensions_api/_permission_features.json

@@ -6,7 +6,7 @@
   "accessibilityPrivate": {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
-    "whitelist" : [ "75C7F4B720314B6CB1B5817CD86089DB95CD2461" ] // built-in chromevox
+    "allowlist" : [ "75C7F4B720314B6CB1B5817CD86089DB95CD2461" ] // built-in chromevox
   },
   "bookmarks": {
     "channel": "stable",
@@ -51,7 +51,7 @@
   "commands.accessibility": {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
-    "whitelist" : [
+    "allowlist" : [
       "75C7F4B720314B6CB1B5817CD86089DB95CD2461"  // built-in chromevox
     ]
   },

extensions/common/api/_api_features.json

@@ -25,7 +25,7 @@
     "contexts": ["blessed_extension"],
     "extension_types": ["extension"],
     "noparent": true,
-    "whitelist": [
+    "allowlist": [
       "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
       "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
       "12E618C3C6E97495AAECF2AC12DEB082353241C6"   // QO component extension
@@ -42,7 +42,7 @@
     "extension_types": ["extension"],
     "noparent": true,
     "component_extensions_auto_granted": false,
-    "whitelist": [
+    "allowlist": [
       "B9EF10DDFEA11EF77873CC5009809E5037FC4C7A",  // Google input tools
       "06BE211D5F014BAB34BC22D9DDA09C63A81D828E",  // Official xkb extension
       "F94EE6AB36D6C6588670B2B01EB65212D9C64E33"   // Open source xkb extension
@@ -319,9 +319,9 @@
     ]
   }],
   "metricsPrivate.getIsCrashReportingEnabled": {
-    "whitelist": [
+    "allowlist": [
       // This function inherits the extension restrictions of metricsPrivate,
-      // but also requires whitelisting. New uses of this function should get
+      // but also requires allowlisting. New uses of this function should get
       // /tools/metrics/OWNERS approval of the usage before adding entries
       // below. See crbug.com/374199.
       "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
@@ -360,7 +360,7 @@
     "contexts": ["blessed_extension"],
     "channel": "stable",
     "extension_types": ["platform_app", "extension"],
-    "whitelist": [
+    "allowlist": [
       "63ED55E43214C211F82122ED56407FF1A807F2A3",   // Media Router Dev
       "226CF815E39A363090A1E547D53063472B8279FA",   // Media Router Stable
       "B41E7F08E1179CC03CBD1F49E57CF353A40ADE07",   // Chrome Camera App Dev

extensions/common/api/_behavior_features.json

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // This features file defines switches used to control Extension behaviour,
-// typically whitelist configuration.
+// typically allowlist configuration.
 // Note, the features defined here are generally ignored for the purposes of
 // extension documentation.
 // See chrome/common/extensions/api/_features.md to understand this file, as
@@ -14,14 +14,14 @@
     "channel": "stable",
     "component_extensions_auto_granted": false,
     "extension_types": ["extension"],
-    "whitelist": [
+    "allowlist": [
       "226CF815E39A363090A1E547D53063472B8279FA"   // Media Router Stable
     ]
   },
   "zoom_without_bubble": {
     "channel": "stable",
     "extension_types": ["extension"],
-    "whitelist": [
+    "allowlist": [
       "CBCC42ABED43A4B58FE3810E62AFFA010EB0349F"   // https://crbug.com/538252
     ]
   },
@@ -35,33 +35,33 @@
     "component_extensions_auto_granted": false,
     "platforms": ["chromeos"],
     "location": "unpacked",
-    "whitelist": [
+    "allowlist": [
       "05D1DBD6E8B9C4690FFA7D50E6F60C5290DC662A"   // crbug.com/941107
     ]
   },
   {
     // Strict restrictions for stable channel.
-    // For now only whitelisted apps.
+    // For now only allowlisted apps.
     "channel": "stable",
     "component_extensions_auto_granted": false,
     "extension_types": ["platform_app"],
     "location": "policy",
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       // https://crbug.com/626342
       "85DA1AC24AF23CDA9F5A19858EB9C6E9E1BA57F6",  // Sign-in Screen Test App
       "EC3DE21E048B67319893889529354DFBFA96FD23",  // Smart Card Connector
       "6B748A5C005F21B7CBCF4170C2F883E435DEB511"   // CSSI Smart Card Middleware
     ]
   }, {
-    // Explicitly whitelist extensions that should always be available
+    // Explicitly allowlist extensions that should always be available
     // on a sign-in screen. Mind that some of them will be closed when signin is
     // performed. See for reference |kNonRiskyExtensionsIdsHashes| in
     // chrome/browser/chromeos/profiles/profile_helper.cc.
     "channel": "stable",
     "component_extensions_auto_granted": false,
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       // https://crbug.com/626342
       "E24F1786D842E91E74C27929B0B3715A4689A473",  // Gnubby component extension
       "6F9E349A0561C78A0D3F41496FE521C5151C7F71",  // Gnubby app
@@ -86,7 +86,7 @@
     "extension_types": ["login_screen_extension"],
     "location": "policy",
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "FA84F98B32AFC3013F5711F8711F8F38DB210AB7", // Sign-in Screen Test Extension
       "7FE4A999359A456C4B0FB7B7AD85CEA29CA50519"  // Login screen APIs test extension
     ]
@@ -101,7 +101,7 @@
   "allow_deprecated_audio_api": {
     "channel": "stable",
     "extension_types": ["platform_app"],
-    "whitelist": [
+    "allowlist": [
       "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578",
       "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB",
       "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/335729
@@ -145,7 +145,7 @@
     "extension_types": ["login_screen_extension"],
     "location": "policy",
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "E219EE36A3B40612FD2A8CD6937B03EF0C97D3FE",
       "4DBFC1C52D6660DD90791976DF7FEF7B3D360509",
       "CDA6A10BE50CE65C59B766D0CE6A27E8E0A1533F",
@@ -165,7 +165,7 @@
     "extension_types": ["extension"],
     "location": "policy",
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "A24DE1B21A67E25FB62AC8491642038FE25DA75B",
       "6B25164FFE2BADB5F1DBBD301CC022170267022D",
       "4D15F9AFCF54E56F0A6E06D22DD15F133DCF0882",

extensions/common/api/_manifest_features.json

@@ -16,16 +16,16 @@
     "channel": "stable",
     "extension_types": ["legacy_packaged_app", "hosted_app", "platform_app"]
   },
-  // The default platform app CSP can only be overridden by whitelisted apps.
+  // The default platform app CSP can only be overridden by allowlisted apps.
   // This is a separate key from the top-level content_security_policy one since
-  // we can't combine type restrictions with whitelisted ID restrictions. If
-  // there is a need for additional whitelisted entries, the feature system
+  // we can't combine type restrictions with allowlisted ID restrictions. If
+  // there is a need for additional allowlisted entries, the feature system
   // should instead be extended to support OR-ing of restrictions.
   "app.content_security_policy": {
     "channel": "stable",
     "extension_types": ["platform_app"],
     "min_manifest_version": 2,
-    "whitelist": [
+    "allowlist": [
       // Keep this list in sync with extensions_misc::kHangoutsExtensionIds but
       // omit the Packaged App ids.
       "53041A2FA309EECED01FFC751E7399186E860B2C",  // Hangouts Production.
@@ -71,7 +71,7 @@
     "channel": "stable",
     "extension_types": ["platform_app"],
     "platforms": ["linux"],
-    "whitelist": [
+    "allowlist": [
       "9E287A8257E58EFB13E89C86A4B75A3AC4B058D8",  // unit_tests browser_tests
       "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80",  // http://crbug.com/396117
       "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE",  // http://crbug.com/396117
@@ -87,14 +87,14 @@
     "channel": "stable",
     "extension_types": ["extension"],
     "platforms": ["chromeos"],
-    "whitelist": [
+    "allowlist": [
       "75C7F4B720314B6CB1B5817CD86089DB95CD2461"  // http://crbug.com/899052
     ]
   }],
   "content_capabilities": [{
     "channel": "stable",
     "extension_types": ["extension"],
-    "whitelist": [
+    "allowlist": [
       "950D13BB9B4794F4CA2A68D3597E5DFAA47C88AE",  // Drive
       "0EEB39B7A9A52CAAE6A072F83320435749B184A4",  // http://crbug.com/481210
       "99717FF3BE1AFB5B343CDD024E53873C1783521B",  // http://crbug.com/838690
@@ -109,8 +109,8 @@
   "content_security_policy": {
     "channel": "stable",
     // Platform apps have a restricted content security policy that cannot be
-    // overriden (except for a whitelist of exceptions, see the
-    // app.content_security_policy whitelist).
+    // overriden (except for a allowlist of exceptions, see the
+    // app.content_security_policy allowlist).
     "extension_types": [
       "extension", "legacy_packaged_app", "login_screen_extension"
     ]
@@ -153,7 +153,7 @@
     }, {
       "channel": "stable",
       "extension_types": [ "extension"],
-      "whitelist": [
+      "allowlist": [
         "2FC374607C2DF285634B67C64A2E356C607091C3",  // Quickoffice
         "3727DD3E564B6055387425027AD74C58784ACC15",  // Quickoffice internal
         "12E618C3C6E97495AAECF2AC12DEB082353241C6"   // QO component extension
@@ -222,7 +222,7 @@
   "mime_types": {
     "channel": "stable",
     "extension_types": [ "extension", "legacy_packaged_app", "platform_app" ],
-    "whitelist": [
+    "allowlist": [
       "787000072C6FBB934AF5A42275CDE73FC977D995",  // browser_tests
       "2FC374607C2DF285634B67C64A2E356C607091C3",  // QuickOffice
       "5D3851BEFF680AB6D954B76678EFCCE834465C23",  // QuickOffice Dev
@@ -234,7 +234,7 @@
   "mime_types_handler": {
     "channel": "stable",
     "extension_types": [ "extension", "legacy_packaged_app", "platform_app" ],
-    "whitelist": [
+    "allowlist": [
       "787000072C6FBB934AF5A42275CDE73FC977D995",  // browser_tests
       "2FC374607C2DF285634B67C64A2E356C607091C3",  // QuickOffice
       "12E618C3C6E97495AAECF2AC12DEB082353241C6",  // QuickOffice component extension
@@ -264,7 +264,7 @@
     "extension_types": [
       "extension", "platform_app"
     ],
-    "whitelist": [
+    "allowlist": [
       "F57FDBA2822F21B82A4C417405ABC51241CC6426",  // unit_tests
       "C41AD9DCD670210295614257EF8C9945AD68D86E",  // Google Now
       "64291898C201DAF15B090EC4B9EC270BEB6BE6FF",  // In-app payments support app.
@@ -328,7 +328,7 @@
     {
       "channel": "stable",
       "extension_types": ["extension"],
-      "whitelist": [
+      "allowlist": [
         "3BC1ED0B3E6EFDC7BD4D3D1D75D44B52DEE0A226",  // Secure Shell Ext (stable)
         "38C361D4A0726CE45D3572D65071B6BDB3092371"   // Secure Shell Ext (dev)
       ]

tools/json_schema_compiler/feature_compiler.py

@@ -70,10 +70,6 @@ CC_FILE_END = """
 }  // namespace extensions
 """
 
-# Legacy keys for the allow and blocklists.
-LEGACY_ALLOWLIST_KEY = 'whitelist'
-LEGACY_BLOCKLIST_KEY = 'blacklist'
-
 def ToPosixPath(path):
   """Returns |path| with separator converted to POSIX style.
 
@@ -133,7 +129,16 @@ FEATURE_GRAMMAR = ({
         str: {},
         'shared': True
     },
-    LEGACY_BLOCKLIST_KEY: {
+    'allowlist': {
+        list: {
+            'subtype':
+            str,
+            'validators':
+            [(ListContainsOnlySha1Hashes,
+              'list should only have hex-encoded SHA1 hashes of extension ids')]
+        }
+    },
+    'blocklist': {
         list: {
             'subtype':
             str,
@@ -271,15 +276,6 @@ FEATURE_GRAMMAR = ({
         str: {},
         'shared': True
     },
-    LEGACY_ALLOWLIST_KEY: {
-        list: {
-            'subtype':
-            str,
-            'validators':
-            [(ListContainsOnlySha1Hashes,
-              'list should only have hex-encoded SHA1 hashes of extension ids')]
-        }
-    },
 })
 
 FEATURE_TYPES = ['APIFeature', 'BehaviorFeature',
@@ -351,7 +347,7 @@ def IsFeatureCrossReference(property_name, reverse_property_name, feature,
 # Verifies that a feature with an allowlist is not available to hosted apps,
 # returning true on success.
 def DoesNotHaveAllowlistForHostedApps(value):
-  if not LEGACY_ALLOWLIST_KEY in value:
+  if not 'allowlist' in value:
     return True
 
   # Hack Alert: |value| here has the code for the generated C++ feature. Since
@@ -394,7 +390,7 @@ def DoesNotHaveAllowlistForHostedApps(value):
       '2653F6F6C39BC6EEBD36A09AFB92A19782FF7EB4',
   ]
 
-  allowlist = cpp_list_to_list(value[LEGACY_ALLOWLIST_KEY])
+  allowlist = cpp_list_to_list(value['allowlist'])
   for entry in allowlist:
     if entry not in HOSTED_APP_EXCEPTIONS:
       return False
@@ -482,14 +478,7 @@ def GetCodeForFeatureValues(feature_values):
     if key in IGNORED_KEYS:
       continue;
 
-    # TODO(devlin): Remove this hack as part of 842387.
-    set_key = key
-    if key == LEGACY_ALLOWLIST_KEY:
-      set_key = 'allowlist'
-    elif key == LEGACY_BLOCKLIST_KEY:
-      set_key = 'blocklist'
-
-    c.Append('feature->set_%s(%s);' % (set_key, feature_values[key]))
+    c.Append('feature->set_%s(%s);' % (key, feature_values[key]))
   return c
 
 class Feature(object):

tools/json_schema_compiler/feature_compiler_test.py

@@ -37,7 +37,7 @@ class FeatureCompilerTest(unittest.TestCase):
   def testFeature(self):
     # Test some basic feature parsing for a sanity check.
     f = self._parseFeature({
-      'blacklist': [
+      'blocklist': [
         'ABCDEF0123456789ABCDEF0123456789ABCDEF01',
         '10FEDCBA9876543210FEDCBA9876543210FEDCBA'
       ],
@@ -60,7 +60,7 @@ class FeatureCompilerTest(unittest.TestCase):
       'noparent': True,
       'platforms': ['mac', 'win'],
       'session_types': ['kiosk', 'regular'],
-      'whitelist': [
+      'allowlist': [
         '0123456789ABCDEF0123456789ABCDEF01234567',
         '76543210FEDCBA9876543210FEDCBA9876543210'
       ]
@@ -366,11 +366,11 @@ class FeatureCompilerTest(unittest.TestCase):
 
     with self.assertRaisesRegexp(AssertionError,
                                  'No default parent found for bookmarks'):
-      c._CompileFeature('bookmarks.export', { "whitelist": ["asdf"] })
+      c._CompileFeature('bookmarks.export', { "allowlist": ["asdf"] })
 
-  def testRealIdsDisallowedInWhitelist(self):
+  def testRealIdsDisallowedInAllowlist(self):
     fake_id = 'a' * 32;
-    f = self._parseFeature({'whitelist': [fake_id],
+    f = self._parseFeature({'allowlist': [fake_id],
                             'extension_types': ['extension'],
                             'channel': 'beta'})
     f.Validate('PermissionFeature', {})
@@ -380,7 +380,7 @@ class FeatureCompilerTest(unittest.TestCase):
   def testHostedAppsCantUseAllowlistedFeatures_SimpleFeature(self):
     f = self._parseFeature({
         'extension_types': ['extension', 'hosted_app'],
-        'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+        'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         'channel': 'beta',
     })
     f.Validate('PermissionFeature', {})
@@ -396,13 +396,13 @@ class FeatureCompilerTest(unittest.TestCase):
         }, {
           'channel': 'beta',
           'extension_types': ['hosted_app'],
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         }])
     c._CompileFeature('valid_feature',
         [{
           'extension_types': ['extension'],
           'channel': 'beta',
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         }, {
           'channel': 'beta',
           'extension_types': ['hosted_app'],
@@ -429,7 +429,7 @@ class FeatureCompilerTest(unittest.TestCase):
 
     c._CompileFeature('parent.child',
         {
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567']
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567']
         })
     feature = c._features.get('parent.child')
     self.assertTrue(feature)

tools/json_schema_compiler/model.py

@@ -83,14 +83,14 @@ class SimpleFeature(object):
   - |unix_name| the unix_name of the feature
   - |channel| the channel where the feature is released
   - |extension_types| the types which can use the feature
-  - |whitelist| a list of extensions allowed to use the feature
+  - |allowlist| a list of extensions allowed to use the feature
   """
   def __init__(self, feature_name, feature_def):
     self.name = feature_name
     self.unix_name = UnixName(self.name)
     self.channel = feature_def['channel']
     self.extension_types = feature_def['extension_types']
-    self.whitelist = feature_def.get('whitelist')
+    self.allowlist = feature_def.get('allowlist')
 
 
 class Namespace(object):

tools/json_schema_compiler/test/features_test.json

@@ -13,11 +13,11 @@
     "contexts": ["blessed_extension"],
     "extension_types": ["extension", "platform_app"],
     "location": "component",
-    "whitelist": [
+    "allowlist": [
       "ABCDEF0123456789ABCDEF0123456789ABCDEF01",
       "10FEDCBA9876543210FEDCBA9876543210FEDCBA"
     ],
-    "blacklist": [
+    "blocklist": [
       "0123456789ABCDEF0123456789ABCDEF01234567",
       "76543210FEDCBA9876543210FEDCBA9876543210"
     ],
@@ -32,13 +32,13 @@
     "internal": true
   },
   "gamma.child": {
-    "whitelist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
+    "allowlist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
     "dependencies": [],
     "platforms": ["linux"]
   },
   "gamma.unparented": {
     "channel": "dev",
-    "blacklist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
+    "blocklist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
     "contexts": ["unblessed_extension"],
     "noparent": true
   },
@@ -66,7 +66,7 @@
     "channel": "beta",
     "contexts": ["blessed_extension"],
     "extension_types": ["extension"],
-    "whitelist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
+    "allowlist": ["0123456789ABCDEF0123456789ABCDEF01234567"],
     "disallow_for_service_workers": false
   }, {
     "channel": "stable",

tools/json_schema_compiler/test/test_features.json

@@ -16,7 +16,7 @@
     {
       "channel": "stable",
       "extension_types": ["platform_app"],
-      "whitelist": [
+      "allowlist": [
         "8C3741E3AF0B93B6E8E0DDD499BB0B74839EA578",
         "E703483CEF33DEC18B4B6DD84B5C776FB9182BDB"
       ]