Safety check UI: sync extension state names with backend

* Sync extension state names within safety check (see also
  crrev.com/c/2091353) by using "blocklisted" for potentially
  problematic extensions.

Bug: 1015841
Change-Id: Ib93054834ae8b86c81d2725e1d6d2da70c6bf9fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095006Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
Commit-Queue: Rainhard Findling <rainhard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748262}

chrome/browser/resources/settings/safety_check_page/safety_check_browser_proxy.js

@@ -64,11 +64,11 @@ cr.define('settings', function() {
   const SafetyCheckExtensionsStatus = {
     CHECKING: 0,
     ERROR: 1,
-    NO_BLACKLISTED_EXTENSIONS: 2,
-    BLACKLISTED_ALL_DISABLED: 3,
-    BLACKLISTED_REENABLED_ALL_BY_USER: 4,
-    BLACKLISTED_REENABLED_SOME_BY_USER: 5,
-    BLACKLISTED_REENABLED_ALL_BY_ADMIN: 6,
+    NO_BLOCKLISTED_EXTENSIONS: 2,
+    BLOCKLISTED_ALL_DISABLED: 3,
+    BLOCKLISTED_REENABLED_ALL_BY_USER: 4,
+    BLOCKLISTED_REENABLED_SOME_BY_USER: 5,
+    BLOCKLISTED_REENABLED_ALL_BY_ADMIN: 6,
   };
 
   /** @interface */

chrome/browser/resources/settings/safety_check_page/safety_check_page.js

@@ -609,11 +609,11 @@ Polymer({
    */
   shouldShowExtensionsButton_: function() {
     switch (this.extensionsStatus_) {
-      case settings.SafetyCheckExtensionsStatus.BLACKLISTED_ALL_DISABLED:
+      case settings.SafetyCheckExtensionsStatus.BLOCKLISTED_ALL_DISABLED:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_ALL_BY_USER:
+          .BLOCKLISTED_REENABLED_ALL_BY_USER:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_SOME_BY_USER:
+          .BLOCKLISTED_REENABLED_SOME_BY_USER:
         return true;
       default:
         return false;
@@ -626,7 +626,7 @@ Polymer({
    */
   shouldShowExtensionsManagedIcon_: function() {
     return this.extensionsStatus_ ==
-        settings.SafetyCheckExtensionsStatus.BLACKLISTED_REENABLED_ALL_BY_ADMIN;
+        settings.SafetyCheckExtensionsStatus.BLOCKLISTED_REENABLED_ALL_BY_ADMIN;
   },
 
   /** @private */
@@ -644,15 +644,15 @@ Polymer({
         return null;
       case settings.SafetyCheckExtensionsStatus.ERROR:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_ALL_BY_ADMIN:
+          .BLOCKLISTED_REENABLED_ALL_BY_ADMIN:
         return 'cr:info';
-      case settings.SafetyCheckExtensionsStatus.NO_BLACKLISTED_EXTENSIONS:
-      case settings.SafetyCheckExtensionsStatus.BLACKLISTED_ALL_DISABLED:
+      case settings.SafetyCheckExtensionsStatus.NO_BLOCKLISTED_EXTENSIONS:
+      case settings.SafetyCheckExtensionsStatus.BLOCKLISTED_ALL_DISABLED:
         return 'cr:check';
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_ALL_BY_USER:
+          .BLOCKLISTED_REENABLED_ALL_BY_USER:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_SOME_BY_USER:
+          .BLOCKLISTED_REENABLED_SOME_BY_USER:
         return 'cr:warning';
       default:
         assertNotReached();
@@ -679,13 +679,13 @@ Polymer({
   getExtensionsIconClass_: function() {
     switch (this.extensionsStatus_) {
       case settings.SafetyCheckExtensionsStatus.CHECKING:
-      case settings.SafetyCheckExtensionsStatus.NO_BLACKLISTED_EXTENSIONS:
-      case settings.SafetyCheckExtensionsStatus.BLACKLISTED_ALL_DISABLED:
+      case settings.SafetyCheckExtensionsStatus.NO_BLOCKLISTED_EXTENSIONS:
+      case settings.SafetyCheckExtensionsStatus.BLOCKLISTED_ALL_DISABLED:
         return 'icon-blue';
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_ALL_BY_USER:
+          .BLOCKLISTED_REENABLED_ALL_BY_USER:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_SOME_BY_USER:
+          .BLOCKLISTED_REENABLED_SOME_BY_USER:
         return 'icon-red';
       default:
         return '';
@@ -699,9 +699,9 @@ Polymer({
   getExtensionsButtonClass_: function() {
     switch (this.extensionsStatus_) {
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_ALL_BY_USER:
+          .BLOCKLISTED_REENABLED_ALL_BY_USER:
       case settings.SafetyCheckExtensionsStatus
-          .BLACKLISTED_REENABLED_SOME_BY_USER:
+          .BLOCKLISTED_REENABLED_SOME_BY_USER:
         return 'action-button';
       default:
         return '';

chrome/test/data/webui/settings/safety_check_page_test.js

@@ -80,7 +80,7 @@ suite('SafetyCheckUiTests', function() {
     fireSafetyCheckSafeBrowsingEvent(
         settings.SafetyCheckSafeBrowsingStatus.ENABLED);
     fireSafetyCheckExtensionsEvent(
-        settings.SafetyCheckExtensionsStatus.NO_BLACKLISTED_EXTENSIONS);
+        settings.SafetyCheckExtensionsStatus.NO_BLOCKLISTED_EXTENSIONS);
 
     Polymer.dom.flush();
 
@@ -228,39 +228,39 @@ suite('SafetyCheckUiTests', function() {
 
   test('extensionsSafeUiTest', function() {
     fireSafetyCheckExtensionsEvent(
-        settings.SafetyCheckExtensionsStatus.NO_BLACKLISTED_EXTENSIONS);
+        settings.SafetyCheckExtensionsStatus.NO_BLOCKLISTED_EXTENSIONS);
     Polymer.dom.flush();
     assertFalse(!!page.$$('#safetyCheckExtensionsButton'));
     assertFalse(!!page.$$('#safetyCheckExtensionsManagedIcon'));
   });
 
-  test('extensionsBlacklistedOffUiTest', function() {
+  test('extensionsBlocklistedOffUiTest', function() {
     fireSafetyCheckExtensionsEvent(
-        settings.SafetyCheckExtensionsStatus.BLACKLISTED_ALL_DISABLED);
+        settings.SafetyCheckExtensionsStatus.BLOCKLISTED_ALL_DISABLED);
     Polymer.dom.flush();
     assertTrue(!!page.$$('#safetyCheckExtensionsButton'));
     assertFalse(!!page.$$('#safetyCheckExtensionsManagedIcon'));
   });
 
-  test('extensionsBlacklistedOnAllUserUiTest', function() {
+  test('extensionsBlocklistedOnAllUserUiTest', function() {
     fireSafetyCheckExtensionsEvent(
-        settings.SafetyCheckExtensionsStatus.BLACKLISTED_REENABLED_ALL_BY_USER);
+        settings.SafetyCheckExtensionsStatus.BLOCKLISTED_REENABLED_ALL_BY_USER);
     Polymer.dom.flush();
     assertTrue(!!page.$$('#safetyCheckExtensionsButton'));
     assertFalse(!!page.$$('#safetyCheckExtensionsManagedIcon'));
   });
 
-  test('extensionsBlacklistedOnUserAdminUiTest', function() {
+  test('extensionsBlocklistedOnUserAdminUiTest', function() {
     fireSafetyCheckExtensionsEvent(settings.SafetyCheckExtensionsStatus
-                                       .BLACKLISTED_REENABLED_SOME_BY_USER);
+                                       .BLOCKLISTED_REENABLED_SOME_BY_USER);
     Polymer.dom.flush();
     assertTrue(!!page.$$('#safetyCheckExtensionsButton'));
     assertFalse(!!page.$$('#safetyCheckExtensionsManagedIcon'));
   });
 
-  test('extensionsBlacklistedOnAllAdminUiTest', function() {
+  test('extensionsBlocklistedOnAllAdminUiTest', function() {
     fireSafetyCheckExtensionsEvent(settings.SafetyCheckExtensionsStatus
-                                       .BLACKLISTED_REENABLED_ALL_BY_ADMIN);
+                                       .BLOCKLISTED_REENABLED_ALL_BY_ADMIN);
     Polymer.dom.flush();
     assertFalse(!!page.$$('#safetyCheckExtensionsButton'));
     assertTrue(!!page.$$('#safetyCheckExtensionsManagedIcon'));