Safety check: refactor metrics histogram variable names

A small code health refactoring that:
* Removes the redundant |SAFETY_CHECK| prefix as well as the additional
|MANAGE_THROUGH| and |REVIEW_THROUGH| from some of the safety check
metrics histogram variable names in metrics browser proxy.
* Extends the |REVIEW_COMPROMISED_PASSWORDS| metric variable name for
better clearity.

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

chrome/browser/resources/settings/metrics_browser_proxy.js

@@ -54,18 +54,18 @@ export const PrivacyElementInteractions = {
  * @enum {number}
  */
 export const SafetyCheckInteractions = {
-  SAFETY_CHECK_START: 0,
-  SAFETY_CHECK_UPDATES_RELAUNCH: 1,
-  SAFETY_CHECK_PASSWORDS_MANAGE: 2,
-  SAFETY_CHECK_SAFE_BROWSING_MANAGE: 3,
-  SAFETY_CHECK_EXTENSIONS_REVIEW: 4,
-  SAFETY_CHECK_CHROME_CLEANER_REBOOT: 5,
-  SAFETY_CHECK_CHROME_CLEANER_REVIEW_INFECTED_STATE: 6,
-  SAFETY_CHECK_PASSWORDS_MANAGE_THROUGH_CARET_NAVIGATION: 7,
-  SAFETY_CHECK_SAFE_BROWSING_MANAGE_THROUGH_CARET_NAVIGATION: 8,
-  SAFETY_CHECK_EXTENSIONS_REVIEW_THROUGH_CARET_NAVIGATION: 9,
-  SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION: 10,
-  SAFETY_CHECK_PASSWORDS_MANAGE_WEAK_PASSWORDS: 11,
+  RUN_SAFETY_CHECK: 0,
+  UPDATES_RELAUNCH: 1,
+  PASSWORDS_MANAGE_COMPROMISED_PASSWORDS: 2,
+  SAFE_BROWSING_MANAGE: 3,
+  EXTENSIONS_REVIEW: 4,
+  CHROME_CLEANER_REBOOT: 5,
+  CHROME_CLEANER_REVIEW_INFECTED_STATE: 6,
+  PASSWORDS_CARET_NAVIGATION: 7,
+  SAFE_BROWSING_CARET_NAVIGATION: 8,
+  EXTENSIONS_CARET_NAVIGATION: 9,
+  CHROME_CLEANER_CARET_NAVIGATION: 10,
+  PASSWORDS_MANAGE_WEAK_PASSWORDS: 11,
   // Leave this at the end.
   COUNT: 12,
 };

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

@@ -196,15 +196,14 @@ Polymer({
     switch (this.status_) {
       case SafetyCheckChromeCleanerStatus.INFECTED:
         this.logUserInteraction_(
-            SafetyCheckInteractions
-                .SAFETY_CHECK_CHROME_CLEANER_REVIEW_INFECTED_STATE,
+            SafetyCheckInteractions.CHROME_CLEANER_REVIEW_INFECTED_STATE,
             'Settings.SafetyCheck.ChromeCleanerReviewInfectedState');
         // Navigate to Chrome cleaner UI.
         this.navigateToFoilPage_();
         break;
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
         this.logUserInteraction_(
-            SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_REBOOT,
+            SafetyCheckInteractions.CHROME_CLEANER_REBOOT,
             'Settings.SafetyCheck.ChromeCleanerReboot');
         this.chromeCleanupBrowserProxy_.restartComputer();
         break;
@@ -239,7 +238,7 @@ Polymer({
   onRowClick_: function() {
     if (this.isRowClickable_()) {
       this.logUserInteraction_(
-          SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+          SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
           'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
       this.navigateToFoilPage_();
     }

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

@@ -131,7 +131,7 @@ Polymer({
   onButtonClick_: function() {
     // Log click both in action and histogram.
     this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-        SafetyCheckInteractions.SAFETY_CHECK_EXTENSIONS_REVIEW);
+        SafetyCheckInteractions.EXTENSIONS_REVIEW);
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.ReviewExtensions');
     this.openExtensionsPage_();
@@ -163,8 +163,7 @@ Polymer({
     if (this.isRowClickable_()) {
       // Log click both in action and histogram.
       this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-          SafetyCheckInteractions
-              .SAFETY_CHECK_EXTENSIONS_REVIEW_THROUGH_CARET_NAVIGATION);
+          SafetyCheckInteractions.EXTENSIONS_CARET_NAVIGATION);
       this.metricsBrowserProxy_.recordAction(
           'Settings.SafetyCheck.ReviewExtensionsThroughCaretNavigation');
       this.openExtensionsPage_();

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

@@ -105,7 +105,7 @@ Polymer({
   runSafetyCheck_: function() {
     // Log click both in action and histogram.
     this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-        SafetyCheckInteractions.SAFETY_CHECK_START);
+        SafetyCheckInteractions.RUN_SAFETY_CHECK);
     this.metricsBrowserProxy_.recordAction('Settings.SafetyCheck.Start');
 
     // Trigger safety check.

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

@@ -135,7 +135,7 @@ Polymer({
   onButtonClick_: function() {
     // Log click both in action and histogram.
     this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-        SafetyCheckInteractions.SAFETY_CHECK_PASSWORDS_MANAGE);
+        SafetyCheckInteractions.PASSWORDS_MANAGE_COMPROMISED_PASSWORDS);
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.ManagePasswords');
     this.openPasswordCheckPage_();
@@ -155,10 +155,8 @@ Polymer({
       // Log click both in action and histogram.
       this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
           this.status_ === SafetyCheckPasswordsStatus.WEAK_PASSWORDS_EXIST ?
-              SafetyCheckInteractions
-                  .SAFETY_CHECK_PASSWORDS_MANAGE_WEAK_PASSWORDS :
-              SafetyCheckInteractions
-                  .SAFETY_CHECK_PASSWORDS_MANAGE_THROUGH_CARET_NAVIGATION);
+              SafetyCheckInteractions.PASSWORDS_MANAGE_WEAK_PASSWORDS :
+              SafetyCheckInteractions.PASSWORDS_CARET_NAVIGATION);
       this.metricsBrowserProxy_.recordAction(
           this.status_ === SafetyCheckPasswordsStatus.WEAK_PASSWORDS_EXIST ?
               'Settings.SafetyCheck.ManageWeakPasswords' :

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

@@ -134,7 +134,7 @@ Polymer({
   onButtonClick_: function() {
     // Log click both in action and histogram.
     this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-        SafetyCheckInteractions.SAFETY_CHECK_SAFE_BROWSING_MANAGE);
+        SafetyCheckInteractions.SAFE_BROWSING_MANAGE);
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.ManageSafeBrowsing');
     this.openSecurityPage_();
@@ -168,8 +168,7 @@ Polymer({
     if (this.isRowClickable_()) {
       // Log click both in action and histogram.
       this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-          SafetyCheckInteractions
-              .SAFETY_CHECK_SAFE_BROWSING_MANAGE_THROUGH_CARET_NAVIGATION);
+          SafetyCheckInteractions.SAFE_BROWSING_CARET_NAVIGATION);
       this.metricsBrowserProxy_.recordAction(
           'Settings.SafetyCheck.ManageSafeBrowsingThroughCaretNavigation');
       this.openSecurityPage_();

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

@@ -119,7 +119,7 @@ Polymer({
   onButtonClick_: function() {
     // Log click both in action and histogram.
     this.metricsBrowserProxy_.recordSafetyCheckInteractionHistogram(
-        SafetyCheckInteractions.SAFETY_CHECK_UPDATES_RELAUNCH);
+        SafetyCheckInteractions.UPDATES_RELAUNCH);
     this.metricsBrowserProxy_.recordAction(
         'Settings.SafetyCheck.RelaunchAfterUpdates');
 

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

@@ -168,8 +168,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     // User clicks the button.
     page.$$('#safetyCheckChild').$$('#button').click();
     await expectLogging(
-        SafetyCheckInteractions
-            .SAFETY_CHECK_CHROME_CLEANER_REVIEW_INFECTED_STATE,
+        SafetyCheckInteractions.CHROME_CLEANER_REVIEW_INFECTED_STATE,
         'Settings.SafetyCheck.ChromeCleanerReviewInfectedState');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
@@ -190,7 +189,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     // User clicks the button.
     page.$$('#safetyCheckChild').$$('#button').click();
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_REBOOT,
+        SafetyCheckInteractions.CHROME_CLEANER_REBOOT,
         'Settings.SafetyCheck.ChromeCleanerReboot');
     // Ensure the browser proxy call is done.
     return chromeCleanupBrowserProxy.whenCalled('restartComputer');
@@ -210,7 +209,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+        SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
         'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
@@ -230,7 +229,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+        SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
         'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
@@ -261,7 +260,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+        SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
         'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
@@ -281,7 +280,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+        SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
         'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
@@ -301,7 +300,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     await expectLogging(
-        SafetyCheckInteractions.SAFETY_CHECK_CHROME_CLEANER_CARET_NAVIGATION,
+        SafetyCheckInteractions.CHROME_CLEANER_CARET_NAVIGATION,
         'Settings.SafetyCheck.ChromeCleanerCaretNavigation');
     // Ensure the correct Settings page is shown.
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());

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

@@ -204,7 +204,7 @@ suite('SafetyCheckPageUiTests', function() {
     page.$$('#safetyCheckParentButton').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_START,
+        SafetyCheckInteractions.RUN_SAFETY_CHECK,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -472,7 +472,7 @@ suite('SafetyCheckUpdatesChildUiTests', function() {
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_UPDATES_RELAUNCH,
+        SafetyCheckInteractions.UPDATES_RELAUNCH,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -571,8 +571,7 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions
-            .SAFETY_CHECK_PASSWORDS_MANAGE_THROUGH_CARET_NAVIGATION,
+        SafetyCheckInteractions.PASSWORDS_CARET_NAVIGATION,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -602,7 +601,7 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_PASSWORDS_MANAGE,
+        SafetyCheckInteractions.PASSWORDS_MANAGE_COMPROMISED_PASSWORDS,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -634,7 +633,7 @@ suite('SafetyCheckPasswordsChildUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_PASSWORDS_MANAGE_WEAK_PASSWORDS,
+        SafetyCheckInteractions.PASSWORDS_MANAGE_WEAK_PASSWORDS,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -728,8 +727,7 @@ suite('SafetyCheckSafeBrowsingChildUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions
-            .SAFETY_CHECK_SAFE_BROWSING_MANAGE_THROUGH_CARET_NAVIGATION,
+        SafetyCheckInteractions.SAFE_BROWSING_CARET_NAVIGATION,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -779,7 +777,7 @@ suite('SafetyCheckSafeBrowsingChildUiTests', function() {
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_SAFE_BROWSING_MANAGE,
+        SafetyCheckInteractions.SAFE_BROWSING_MANAGE,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -849,7 +847,7 @@ suite('SafetyCheckExtensionsChildUiTests', function() {
     page.$$('#safetyCheckChild').$$('#button').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions.SAFETY_CHECK_EXTENSIONS_REVIEW,
+        SafetyCheckInteractions.EXTENSIONS_REVIEW,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(
@@ -896,8 +894,7 @@ suite('SafetyCheckExtensionsChildUiTests', function() {
     page.$$('#safetyCheckChild').click();
     // Ensure UMA is logged.
     assertEquals(
-        SafetyCheckInteractions
-            .SAFETY_CHECK_EXTENSIONS_REVIEW_THROUGH_CARET_NAVIGATION,
+        SafetyCheckInteractions.EXTENSIONS_CARET_NAVIGATION,
         await metricsBrowserProxy.whenCalled(
             'recordSafetyCheckInteractionHistogram'));
     assertEquals(