Safety check Chrome cleaner child: simplify states

* The C++ side of the Chrome cleaner child immediately condenses the
  received states to the ones that are relevant for the child. This
  reduces complexity on the JS side and simplifies recording metrics.

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

chrome/app/settings_chromium_strings.grdp

@@ -158,12 +158,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED" desc="This text describes that Chrome found harmful software on the computer.">
     Chromium found harmful software on your computer
   </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR" desc="This text describes that Chrome can't check for unwanted software due to an error.">
-    An error occurred while Chromium was checking the device software
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN" desc="This text describes that Chrome can't check for unwanted software because an administrator disabled the feature.">
-    Your administrator has disabled Chromium's check for harmful software
-  </message>
 
   <!-- People Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">

chrome/app/settings_chromium_strings_grdp/IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR.png.sha1

-11adbc65a727f22fea63e7aaa7517e4786d7b382
\ No newline at end of file

chrome/app/settings_google_chrome_strings.grdp

@@ -159,12 +159,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED" desc="This text describes that Chrome found harmful software on the computer.">
     Chrome found harmful software on your computer
   </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR" desc="This text describes that Chrome can't check for unwanted software due to an error.">
-    An error occurred while Chrome was checking the device software
-  </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN" desc="This text describes that Chrome can't check for unwanted software because an administrator disabled the feature.">
-    Your administrator has disabled Chrome's check for harmful software
-  </message>
 
   <!-- People Page -->
   <message name="IDS_SETTINGS_SYNC_DISCONNECT_DELETE_PROFILE_WARNING_WITH_COUNTS_SINGULAR" desc="Warning message displayed in the Sign out of Chrome dialog that indicates profile browsing data will be removed from the device.">

chrome/app/settings_google_chrome_strings_grdp/IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR.png.sha1

-11adbc65a727f22fea63e7aaa7517e4786d7b382
\ No newline at end of file

chrome/app/settings_strings.grdp

@@ -1193,9 +1193,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_REVIEW" desc="Text for a button that allows users to review safety check findings, such as compromised passwords or blocklisted extensions.">
     Review
   </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_REVIEW_ERROR_DETAILS" desc="Accessibility text for a button that allows users to review error details.">
-    Review error details
-  </message>
   <message name="IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL" desc="'Updates' is an element in safety check that shows the update status of Chrome.">
     Updates
   </message>
@@ -1262,9 +1259,6 @@
   <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL" desc="Accessiblity text for the button that allows users to review and remove harmful software found on their computer.">
     Review device software
   </message>
-  <message name="IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_MORE_BUTTON_ARIA_LABEL" desc="Accessiblity text for the button that leads users to the Chrome cleaner page, which explains details about the device softrware check.">
-    Show details of the device software check
-  </message>
 
   <message name="IDS_SETTINGS_NETWORK_PREDICTION_ENABLED_LABEL" desc="In the advanced options tab, the text next to the checkbox that enables prediction of network actions.  Actions include browser-initiated DNS prefetching, TCP and SSL preconnection, and prerendering of webpages.">
     Preload pages for faster browsing and searching

chrome/app/settings_strings_grdp/IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_MORE_BUTTON_ARIA_LABEL.png.sha1

-8cba4a7618c7021e673c6fe4bbfe38d3caed87bb
\ No newline at end of file

chrome/app/settings_strings_grdp/IDS_SETTINGS_SAFETY_CHECK_REVIEW_ERROR_DETAILS.png.sha1

-11adbc65a727f22fea63e7aaa7517e4786d7b382
\ No newline at end of file

chrome/browser/resources/settings/safety_check_page/BUILD.gn

@@ -45,6 +45,7 @@ js_library("safety_check_chrome_cleaner_child") {
     "../chrome_cleanup_page:chrome_cleanup_proxy",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }
@@ -63,6 +64,10 @@ js_library("safety_check_extensions_child") {
 js_library("safety_check_page") {
   deps = [
     ":safety_check_browser_proxy",
+
+    # This element is included on all platforms to ensure it's type checked (the element itself
+    # only exists in Windows).
+    ":safety_check_chrome_cleaner_child",
     ":safety_check_extensions_child",
     ":safety_check_passwords_child",
     ":safety_check_safe_browsing_child",
@@ -77,10 +82,6 @@ js_library("safety_check_page") {
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
-
-  if (is_win) {
-    deps += [ ":safety_check_chrome_cleaner_child" ]
-  }
 }
 
 js_library("safety_check_passwords_child") {

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

@@ -113,23 +113,10 @@ export const SafetyCheckExtensionsStatus = {
  * @enum {number}
  */
 export const SafetyCheckChromeCleanerStatus = {
-  CHECKING: 0,
-  INITIAL: 1,
-  REPORTER_FOUND_NOTHING: 2,
-  REPORTER_FAILED: 3,
-  SCANNING_FOUND_NOTHING: 4,
-  SCANNING_FAILED: 5,
-  CONNECTION_LOST: 6,
-  USER_DECLINED_CLEANUP: 7,
-  CLEANING_FAILED: 8,
-  CLEANING_SUCCEEDED: 9,
-  CLEANER_DOWNLOAD_FAILED: 10,
-  REPORTER_RUNNING: 11,
-  SCANNING: 12,
-  INFECTED: 13,
-  CLEANING: 14,
-  REBOOT_REQUIRED: 15,
-  DISABLED_BY_ADMIN: 16,
+  HIDDEN: 0,
+  CHECKING: 1,
+  INFECTED: 2,
+  REBOOT_REQUIRED: 3,
 };
 
 /** @interface */

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

-<settings-safety-check-child
-    id="safetyCheckChild"
-    icon-status="[[getIconStatus_(status_)]]"
-    label="$i18n{safetyCheckChromeCleanerPrimaryLabel}"
-    sub-label="[[displayString_]]"
-    button-label="[[getButtonLabel_(status_)]]"
-    button-aria-label="[[getButtonAriaLabel_(status_)]]"
-    button-class="[[getButtonClass_(status_)]]"
-    on-button-click="onButtonClick_">
-</settings-safety-check-child>
+<template is="dom-if" if="[[showChild_(status_)]]"
+    restamp>
+  <settings-safety-check-child
+      id="safetyCheckChild"
+      icon-status="[[getIconStatus_(status_)]]"
+      label="$i18n{safetyCheckChromeCleanerPrimaryLabel}"
+      sub-label="[[displayString_]]"
+      button-label="[[getButtonLabel_(status_)]]"
+      button-aria-label="[[getButtonAriaLabel_(status_)]]"
+      button-class="[[getButtonClass_(status_)]]"
+      on-button-click="onButtonClick_">
+  </settings-safety-check-child>
+</template>
\ No newline at end of file

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

@@ -10,6 +10,7 @@
 import {assertNotReached} from 'chrome://resources/js/assert.m.js';
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 import {ChromeCleanupProxy, ChromeCleanupProxyImpl} from '../chrome_cleanup_page/chrome_cleanup_proxy.js';
@@ -45,7 +46,7 @@ Polymer({
      */
     status_: {
       type: Number,
-      value: SafetyCheckChromeCleanerStatus.CHECKING,
+      value: SafetyCheckChromeCleanerStatus.HIDDEN,
     },
 
     /**
@@ -81,36 +82,29 @@ Polymer({
     this.displayString_ = event.displayString;
   },
 
+
+  /**
+   * @return {boolean}
+   * @private
+   */
+  showChild_: function() {
+    return this.status_ !== SafetyCheckChromeCleanerStatus.HIDDEN &&
+        loadTimeData.valueExists('safetyCheckChromeCleanerChildEnabled') &&
+        loadTimeData.getBoolean('safetyCheckChromeCleanerChildEnabled');
+  },
+
   /**
    * @return {SafetyCheckIconStatus}
    * @private
    */
   getIconStatus_: function() {
     switch (this.status_) {
+      case SafetyCheckChromeCleanerStatus.HIDDEN:
       case SafetyCheckChromeCleanerStatus.CHECKING:
         return SafetyCheckIconStatus.RUNNING;
-      case SafetyCheckChromeCleanerStatus.INITIAL:
-      case SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.CLEANING_SUCCEEDED:
-      case SafetyCheckChromeCleanerStatus.REPORTER_RUNNING:
-      case SafetyCheckChromeCleanerStatus.SCANNING:
-        // Safe states.
-        return SafetyCheckIconStatus.SAFE;
-      case SafetyCheckChromeCleanerStatus.REPORTER_FAILED:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANER_DOWNLOAD_FAILED:
-        // Error states.
-      case SafetyCheckChromeCleanerStatus.CLEANING:
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
-      case SafetyCheckChromeCleanerStatus.DISABLED_BY_ADMIN:
-        // Other states.
         return SafetyCheckIconStatus.INFO;
-      case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-      case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
       case SafetyCheckChromeCleanerStatus.INFECTED:
-        // Infected states.
         return SafetyCheckIconStatus.WARNING;
       default:
         assertNotReached();
@@ -123,26 +117,7 @@ Polymer({
    */
   getButtonLabel_: function() {
     switch (this.status_) {
-      case SafetyCheckChromeCleanerStatus.INITIAL:
-      case SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.CLEANING_SUCCEEDED:
-      case SafetyCheckChromeCleanerStatus.REPORTER_RUNNING:
-      case SafetyCheckChromeCleanerStatus.SCANNING:
-        // Safe states.
-        return this.i18n('privacyPageMore');
-      case SafetyCheckChromeCleanerStatus.REPORTER_FAILED:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANER_DOWNLOAD_FAILED:
-        // Error states.
-        return this.i18n('passwordViewDetails');
-      case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-      case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
       case SafetyCheckChromeCleanerStatus.INFECTED:
-        // Infected states.
-      case SafetyCheckChromeCleanerStatus.CLEANING:
-        // Cleaning in progress.
         return this.i18n('safetyCheckReview');
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
         return this.i18n('chromeCleanupRestartButtonLabel');
@@ -157,26 +132,7 @@ Polymer({
    */
   getButtonAriaLabel_: function() {
     switch (this.status_) {
-      case SafetyCheckChromeCleanerStatus.INITIAL:
-      case SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.CLEANING_SUCCEEDED:
-      case SafetyCheckChromeCleanerStatus.REPORTER_RUNNING:
-      case SafetyCheckChromeCleanerStatus.SCANNING:
-        // Safe states.
-        return this.i18n('safetyCheckChromeCleanerMoreButtonAriaLabel');
-      case SafetyCheckChromeCleanerStatus.REPORTER_FAILED:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CLEANER_DOWNLOAD_FAILED:
-        // Error states.
-        return this.i18n('safetyCheckReviewErrorDetails');
-      case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-      case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
       case SafetyCheckChromeCleanerStatus.INFECTED:
-        // Infected states.
-      case SafetyCheckChromeCleanerStatus.CLEANING:
-        // Cleaning in progress.
         return this.i18n('safetyCheckChromeCleanerButtonAriaLabel');
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
         return this.i18n('chromeCleanupRestartButtonLabel');
@@ -191,8 +147,6 @@ Polymer({
    */
   getButtonClass_: function() {
     switch (this.status_) {
-      case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-      case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
       case SafetyCheckChromeCleanerStatus.INFECTED:
       case SafetyCheckChromeCleanerStatus.REBOOT_REQUIRED:
         return 'action-button';
@@ -206,24 +160,7 @@ Polymer({
     // TODO(crbug.com/1087263): Add metrics for safety check CCT child user
     // actions.
     switch (this.status_) {
-      case SafetyCheckChromeCleanerStatus.INITIAL:
-      case SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FOUND_NOTHING:
-      case SafetyCheckChromeCleanerStatus.CLEANING_SUCCEEDED:
-      case SafetyCheckChromeCleanerStatus.REPORTER_RUNNING:
-      case SafetyCheckChromeCleanerStatus.SCANNING:
-        // Safe states.
-      case SafetyCheckChromeCleanerStatus.REPORTER_FAILED:
-      case SafetyCheckChromeCleanerStatus.SCANNING_FAILED:
-      case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-      case SafetyCheckChromeCleanerStatus.CLEANING_FAILED:
-        // Error states.
-      case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
-      case SafetyCheckChromeCleanerStatus.CLEANER_DOWNLOAD_FAILED:
       case SafetyCheckChromeCleanerStatus.INFECTED:
-        // Infected states.
-      case SafetyCheckChromeCleanerStatus.CLEANING:
-        // Cleaning in progress.
         Router.getInstance().navigateTo(
             routes.CHROME_CLEANUP,
             /* dynamicParams= */ null, /* removeSearch= */ true);

chrome/browser/resources/settings/safety_check_page/safety_check_page.html

@@ -46,10 +46,7 @@
       <settings-safety-check-extensions-child>
       </settings-safety-check-extensions-child>
 <if expr="_google_chrome and is_win">
-      <template is="dom-if" if="[[showChromeCleanerChild_(parentStatus_)]]"
-          restamp>
-        <settings-safety-check-chrome-cleaner-child id="chromeCleanerChild">
-        </settings-safety-check-chrome-cleaner-child>
-      </template>
+      <settings-safety-check-chrome-cleaner-child id="chromeCleanerChild">
+      </settings-safety-check-chrome-cleaner-child>
 </if>
     </iron-collapse>

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

@@ -25,7 +25,6 @@ import './safety_check_updates_child.js';
 import './safety_check_chrome_cleaner_child.js';
 // </if>
 
-import {assertNotReached} from 'chrome://resources/js/assert.m.js';
 import {I18nBehavior} from 'chrome://resources/js/i18n_behavior.m.js';
 import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
 import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-announcer/iron-a11y-announcer.js';
@@ -182,13 +181,4 @@ Polymer({
   shouldShowChildren_: function() {
     return this.parentStatus_ !== SafetyCheckParentStatus.BEFORE;
   },
-
-  /**
-   * @return {boolean}
-   * @private
-   */
-  showChromeCleanerChild_: function() {
-    return loadTimeData.valueExists('safetyCheckChromeCleanerChildEnabled') &&
-        loadTimeData.getBoolean('safetyCheckChromeCleanerChildEnabled');
-  },
 });

chrome/browser/ui/webui/settings/safety_check_handler.cc

@@ -98,48 +98,47 @@ SafetyCheckHandler::ChromeCleanerStatus ConvertToChromeCleanerStatus(
     case safe_browsing::ChromeCleanerController::State::kIdle:
       switch (idle_reason) {
         case safe_browsing::ChromeCleanerController::IdleReason::kInitial:
-          return SafetyCheckHandler::ChromeCleanerStatus::kInitial;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kReporterFoundNothing:
-          return SafetyCheckHandler::ChromeCleanerStatus::kReporterFoundNothing;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kReporterFailed:
-          return SafetyCheckHandler::ChromeCleanerStatus::kReporterFailed;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kScanningFoundNothing:
-          return SafetyCheckHandler::ChromeCleanerStatus::kScanningFoundNothing;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kScanningFailed:
-          return SafetyCheckHandler::ChromeCleanerStatus::kScanningFailed;
-        case safe_browsing::ChromeCleanerController::IdleReason::
-            kConnectionLost:
-          return SafetyCheckHandler::ChromeCleanerStatus::kConnectionLost;
-        case safe_browsing::ChromeCleanerController::IdleReason::
-            kUserDeclinedCleanup:
-          return SafetyCheckHandler::ChromeCleanerStatus::kUserDeclinedCleanup;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kCleaningFailed:
-          return SafetyCheckHandler::ChromeCleanerStatus::kCleaningFailed;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kCleaningSucceeded:
-          return SafetyCheckHandler::ChromeCleanerStatus::kCleaningSucceeded;
         case safe_browsing::ChromeCleanerController::IdleReason::
             kCleanerDownloadFailed:
-          return SafetyCheckHandler::ChromeCleanerStatus::
-              kCleanerDownloadFailed;
+          return SafetyCheckHandler::ChromeCleanerStatus::kHidden;
+        case safe_browsing::ChromeCleanerController::IdleReason::
+            kConnectionLost:
+        case safe_browsing::ChromeCleanerController::IdleReason::
+            kUserDeclinedCleanup:
+          return SafetyCheckHandler::ChromeCleanerStatus::kInfected;
       }
     case safe_browsing::ChromeCleanerController::State::kReporterRunning:
-      return SafetyCheckHandler::ChromeCleanerStatus::kReporterRunning;
     case safe_browsing::ChromeCleanerController::State::kScanning:
-      return SafetyCheckHandler::ChromeCleanerStatus::kScanning;
+    case safe_browsing::ChromeCleanerController::State::kCleaning:
+      return SafetyCheckHandler::ChromeCleanerStatus::kHidden;
     case safe_browsing::ChromeCleanerController::State::kInfected:
       return SafetyCheckHandler::ChromeCleanerStatus::kInfected;
-    case safe_browsing::ChromeCleanerController::State::kCleaning:
-      return SafetyCheckHandler::ChromeCleanerStatus::kCleaning;
     case safe_browsing::ChromeCleanerController::State::kRebootRequired:
       return SafetyCheckHandler::ChromeCleanerStatus::kRebootRequired;
   }
 }
+
+SafetyCheckHandler::ChromeCleanerStatus fetchCurrentChromeCleanerStatus() {
+  if (!safe_browsing::ChromeCleanerController::GetInstance()
+           ->IsAllowedByPolicy()) {
+    return SafetyCheckHandler::ChromeCleanerStatus::kHidden;
+  }
+  return ConvertToChromeCleanerStatus(
+      safe_browsing::ChromeCleanerController::GetInstance()->state(),
+      safe_browsing::ChromeCleanerController::GetInstance()->idle_reason());
+}
 #endif
 }  // namespace
 
@@ -157,7 +156,16 @@ void SafetyCheckHandler::SendSafetyCheckStartedWebUiUpdates() {
   passwords_status_ = PasswordsStatus::kChecking;
   safe_browsing_status_ = SafeBrowsingStatus::kChecking;
   extensions_status_ = ExtensionsStatus::kChecking;
-  chrome_cleaner_status_ = ChromeCleanerStatus::kChecking;
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // If the Chrome cleaner status results in the child being hidden,
+  // then also hide it already in the "running" state.
+  if (fetchCurrentChromeCleanerStatus() ==
+      SafetyCheckHandler::ChromeCleanerStatus::kHidden) {
+    chrome_cleaner_status_ = SafetyCheckHandler::ChromeCleanerStatus::kHidden;
+  } else {
+    chrome_cleaner_status_ = SafetyCheckHandler::ChromeCleanerStatus::kChecking;
+  }
+#endif
 
   // Update WebUi.
   FireBasicSafetyCheckWebUiListener(kUpdatesEvent,
@@ -347,14 +355,9 @@ void SafetyCheckHandler::CheckExtensions() {
 
 #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
 void SafetyCheckHandler::CheckChromeCleaner() {
-  if (safe_browsing::ChromeCleanerController::GetInstance()
-          ->IsAllowedByPolicy()) {
-    OnChromeCleanerCheckResult(ConvertToChromeCleanerStatus(
-        safe_browsing::ChromeCleanerController::GetInstance()->state(),
-        safe_browsing::ChromeCleanerController::GetInstance()->idle_reason()));
-  } else {
-    OnChromeCleanerCheckResult(ChromeCleanerStatus::kDisabledByAdmin);
-  }
+  // Registering the observer immediately triggers a callback with the
+  // current state.
+  safe_browsing::ChromeCleanerController::GetInstance()->AddObserver(this);
 }
 #endif
 
@@ -597,37 +600,15 @@ base::string16 SafetyCheckHandler::GetStringForExtensions(
 base::string16 SafetyCheckHandler::GetStringForChromeCleaner(
     ChromeCleanerStatus status) {
   switch (status) {
+    case ChromeCleanerStatus::kHidden:
     case ChromeCleanerStatus::kChecking:
       return base::UTF8ToUTF16("");
-    case ChromeCleanerStatus::kInitial:
-    case ChromeCleanerStatus::kReporterFoundNothing:
-    case ChromeCleanerStatus::kScanningFoundNothing:
-    case ChromeCleanerStatus::kCleaningSucceeded:
-    case ChromeCleanerStatus::kReporterRunning:
-    case ChromeCleanerStatus::kScanning:
-      return l10n_util::GetStringUTF16(
-          IDS_SETTINGS_RESET_CLEANUP_TITLE_NOTHING_FOUND);
-    case ChromeCleanerStatus::kReporterFailed:
-    case ChromeCleanerStatus::kScanningFailed:
-    case ChromeCleanerStatus::kCleaningFailed:
-    case ChromeCleanerStatus::kCleanerDownloadFailed:
-      return l10n_util::GetStringUTF16(
-          IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_ERROR);
-    case ChromeCleanerStatus::kConnectionLost:
-    case ChromeCleanerStatus::kUserDeclinedCleanup:
     case ChromeCleanerStatus::kInfected:
       return l10n_util::GetStringUTF16(
           IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_INFECTED);
-    case ChromeCleanerStatus::kCleaning:
-      return l10n_util::GetStringUTF16(
-          IDS_SETTINGS_RESET_CLEANUP_TITLE_REMOVING);
     case ChromeCleanerStatus::kRebootRequired:
       return l10n_util::GetStringUTF16(
           IDS_SETTINGS_RESET_CLEANUP_TITLE_RESTART);
-    case ChromeCleanerStatus::kDisabledByAdmin:
-      return l10n_util::GetStringFUTF16(
-          IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_DISABLED_BY_ADMIN,
-          base::ASCIIToUTF16(chrome::kWhoIsMyAdministratorHelpURL));
   }
 }
 #endif
@@ -835,6 +816,40 @@ void SafetyCheckHandler::OnCredentialDone(
                            total);
   }
 }
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+void SafetyCheckHandler::OnIdle(
+    safe_browsing::ChromeCleanerController::IdleReason idle_reason) {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnReporterRunning() {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnScanning() {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnInfected(
+    bool is_powered_by_partner,
+    const safe_browsing::ChromeCleanerScannerResults& scanner_results) {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnCleaning(
+    bool is_powered_by_partner,
+    const safe_browsing::ChromeCleanerScannerResults& scanner_results) {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnRebootRequired() {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+
+void SafetyCheckHandler::OnRebootFailed() {
+  OnChromeCleanerCheckResult(fetchCurrentChromeCleanerStatus());
+}
+#endif
 
 void SafetyCheckHandler::OnJavascriptAllowed() {}
 
@@ -853,6 +868,10 @@ void SafetyCheckHandler::OnJavascriptDisallowed() {
   version_updater_.reset();
   // Stop observing safety check events.
   safety_check_.reset(nullptr);
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // Remove |this| as an observer for the Chrome cleaner.
+  safe_browsing::ChromeCleanerController::GetInstance()->RemoveObserver(this);
+#endif
 }
 
 void SafetyCheckHandler::RegisterMessages() {

chrome/browser/ui/webui/settings/safety_check_handler.h

@@ -27,12 +27,20 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h"
+#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h"
+#endif
+
 // Settings page UI handler that checks four areas of browser safety:
 // browser updates, password leaks, malicious extensions, and unwanted
 // software.
 class SafetyCheckHandler
     : public settings::SettingsPageUIHandler,
       public password_manager::BulkLeakCheckServiceInterface::Observer,
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+      public safe_browsing::ChromeCleanerController::Observer,
+#endif
       public safety_check::SafetyCheck::SafetyCheckHandlerInterface {
  public:
   // The following enum represent the state of the safety check parent
@@ -89,25 +97,12 @@ class SafetyCheckHandler
     kMaxValue = kBlocklistedReenabledAllByAdmin,
   };
   enum class ChromeCleanerStatus {
-    kChecking = 0,
-    kInitial = 1,
-    kReporterFoundNothing = 2,
-    kReporterFailed = 3,
-    kScanningFoundNothing = 4,
-    kScanningFailed = 5,
-    kConnectionLost = 6,
-    kUserDeclinedCleanup = 7,
-    kCleaningFailed = 8,
-    kCleaningSucceeded = 9,
-    kCleanerDownloadFailed = 10,
-    kReporterRunning = 11,
-    kScanning = 12,
-    kInfected = 13,
-    kCleaning = 14,
-    kRebootRequired = 15,
-    kDisabledByAdmin = 16,
+    kHidden = 0,
+    kChecking = 1,
+    kInfected = 2,
+    kRebootRequired = 3,
     // New enum values must go above here.
-    kMaxValue = kDisabledByAdmin,
+    kMaxValue = kRebootRequired,
   };
 
   SafetyCheckHandler();
@@ -259,6 +254,22 @@ class SafetyCheckHandler
   void OnCredentialDone(const password_manager::LeakCheckCredential& credential,
                         password_manager::IsLeaked is_leaked) override;
 
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // safe_browsing::ChromeCleanerController::Observer overrides.
+  void OnIdle(
+      safe_browsing::ChromeCleanerController::IdleReason idle_reason) override;
+  void OnReporterRunning() override;
+  void OnScanning() override;
+  void OnInfected(bool is_powered_by_partner,
+                  const safe_browsing::ChromeCleanerScannerResults&
+                      scanner_results) override;
+  void OnCleaning(bool is_powered_by_partner,
+                  const safe_browsing::ChromeCleanerScannerResults&
+                      scanner_results) override;
+  void OnRebootRequired() override;
+  void OnRebootFailed() override;
+#endif
+
   // SettingsPageUIHandler implementation.
   void OnJavascriptAllowed() override;
   void OnJavascriptDisallowed() override;
@@ -281,8 +292,7 @@ class SafetyCheckHandler
   PasswordsStatus passwords_status_ = PasswordsStatus::kChecking;
   SafeBrowsingStatus safe_browsing_status_ = SafeBrowsingStatus::kChecking;
   ExtensionsStatus extensions_status_ = ExtensionsStatus::kChecking;
-  ChromeCleanerStatus chrome_cleaner_status_ = ChromeCleanerStatus::kChecking;
-
+  ChromeCleanerStatus chrome_cleaner_status_ = ChromeCleanerStatus::kHidden;
   // System time when safety check completed.
   base::Time safety_check_completion_time_;
 

chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc

@@ -41,7 +41,6 @@
 
 #if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
 #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.h"
-#include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -1159,51 +1158,47 @@ INSTANTIATE_TEST_SUITE_P(
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kInitial,
-        SafetyCheckHandler::ChromeCleanerStatus::kInitial,
-        base::UTF8ToUTF16("No harmful software found"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
-INSTANTIATE_TEST_SUITE_P(
-    CheckChromeCleaner_ReporterFoundNothing,
-    SafetyCheckHandlerChromeCleanerIdleTest,
-    ::testing::Values(std::make_tuple(
-        safe_browsing::ChromeCleanerController::IdleReason::
-            kReporterFoundNothing,
-        SafetyCheckHandler::ChromeCleanerStatus::kReporterFoundNothing,
-        base::UTF8ToUTF16("No harmful software found"))));
+INSTANTIATE_TEST_SUITE_P(CheckChromeCleaner_ReporterFoundNothing,
+                         SafetyCheckHandlerChromeCleanerIdleTest,
+                         ::testing::Values(std::make_tuple(
+                             safe_browsing::ChromeCleanerController::
+                                 IdleReason::kReporterFoundNothing,
+                             SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+                             base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_ReporterFailed,
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kReporterFailed,
-        SafetyCheckHandler::ChromeCleanerStatus::kReporterFailed,
-        base::UTF8ToUTF16("An error occurred while Browser was checking the "
-                          "device software"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
-INSTANTIATE_TEST_SUITE_P(
-    CheckChromeCleaner_ScanningFoundNothing,
-    SafetyCheckHandlerChromeCleanerIdleTest,
-    ::testing::Values(std::make_tuple(
-        safe_browsing::ChromeCleanerController::IdleReason::
-            kScanningFoundNothing,
-        SafetyCheckHandler::ChromeCleanerStatus::kScanningFoundNothing,
-        base::UTF8ToUTF16("No harmful software found"))));
+INSTANTIATE_TEST_SUITE_P(CheckChromeCleaner_ScanningFoundNothing,
+                         SafetyCheckHandlerChromeCleanerIdleTest,
+                         ::testing::Values(std::make_tuple(
+                             safe_browsing::ChromeCleanerController::
+                                 IdleReason::kScanningFoundNothing,
+                             SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+                             base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_ScanningFailed,
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kScanningFailed,
-        SafetyCheckHandler::ChromeCleanerStatus::kScanningFailed,
-        base::UTF8ToUTF16("An error occurred while Browser was checking the "
-                          "device software"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_ConnectionLost,
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kConnectionLost,
-        SafetyCheckHandler::ChromeCleanerStatus::kConnectionLost,
+        SafetyCheckHandler::ChromeCleanerStatus::kInfected,
         base::UTF8ToUTF16("Browser found harmful software on your computer"))));
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1212,7 +1207,7 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::
             kUserDeclinedCleanup,
-        SafetyCheckHandler::ChromeCleanerStatus::kUserDeclinedCleanup,
+        SafetyCheckHandler::ChromeCleanerStatus::kInfected,
         base::UTF8ToUTF16("Browser found harmful software on your computer"))));
 
 INSTANTIATE_TEST_SUITE_P(
@@ -1220,27 +1215,24 @@ INSTANTIATE_TEST_SUITE_P(
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kCleaningFailed,
-        SafetyCheckHandler::ChromeCleanerStatus::kCleaningFailed,
-        base::UTF8ToUTF16("An error occurred while Browser was checking the "
-                          "device software"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_CleaningSucceed,
     SafetyCheckHandlerChromeCleanerIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::IdleReason::kCleaningSucceeded,
-        SafetyCheckHandler::ChromeCleanerStatus::kCleaningSucceeded,
-        base::UTF8ToUTF16("No harmful software found"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
-INSTANTIATE_TEST_SUITE_P(
-    CheckChromeCleaner_CleanerDownloadFailed,
-    SafetyCheckHandlerChromeCleanerIdleTest,
-    ::testing::Values(std::make_tuple(
-        safe_browsing::ChromeCleanerController::IdleReason::
-            kCleanerDownloadFailed,
-        SafetyCheckHandler::ChromeCleanerStatus::kCleanerDownloadFailed,
-        base::UTF8ToUTF16("An error occurred while Browser was checking the "
-                          "device software"))));
+INSTANTIATE_TEST_SUITE_P(CheckChromeCleaner_CleanerDownloadFailed,
+                         SafetyCheckHandlerChromeCleanerIdleTest,
+                         ::testing::Values(std::make_tuple(
+                             safe_browsing::ChromeCleanerController::
+                                 IdleReason::kCleanerDownloadFailed,
+                             SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+                             base::UTF8ToUTF16(""))));
 
 class SafetyCheckHandlerChromeCleanerNonIdleTest
     : public SafetyCheckHandlerTest,
@@ -1279,16 +1271,16 @@ INSTANTIATE_TEST_SUITE_P(
     SafetyCheckHandlerChromeCleanerNonIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::State::kReporterRunning,
-        SafetyCheckHandler::ChromeCleanerStatus::kReporterRunning,
-        base::UTF8ToUTF16("No harmful software found"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_Scanning,
     SafetyCheckHandlerChromeCleanerNonIdleTest,
     ::testing::Values(std::make_tuple(
         safe_browsing::ChromeCleanerController::State::kScanning,
-        SafetyCheckHandler::ChromeCleanerStatus::kScanning,
-        base::UTF8ToUTF16("No harmful software found"))));
+        SafetyCheckHandler::ChromeCleanerStatus::kHidden,
+        base::UTF8ToUTF16(""))));
 
 INSTANTIATE_TEST_SUITE_P(
     CheckChromeCleaner_Infected,
@@ -1316,12 +1308,9 @@ TEST_F(SafetyCheckHandlerTest, CheckChromeCleaner_DisabledByAdmin) {
   const base::DictionaryValue* event =
       GetSafetyCheckStatusChangedWithDataIfExists(
           kChromeCleaner,
-          static_cast<int>(
-              SafetyCheckHandler::ChromeCleanerStatus::kDisabledByAdmin));
+          static_cast<int>(SafetyCheckHandler::ChromeCleanerStatus::kHidden));
   ASSERT_TRUE(event);
-  VerifyDisplayString(
-      event,
-      "Your administrator has disabled Browser's check for harmful software");
+  VerifyDisplayString(event, "");
 }
 #endif
 
@@ -1471,11 +1460,17 @@ TEST_F(SafetyCheckHandlerTest, CheckSafetyCheckCompletedWebUiEvents) {
   // Mock safety check invocation.
   safety_check_->PerformSafetyCheck();
 
-  // Password mocks need to be triggered with a non-checking state to fire.
-  // All other mocks fire automatically when invoked.
+  // Set the password check mock response.
   test_leak_service_->set_state_and_notify(
       password_manager::BulkLeakCheckService::State::kSignedOut);
 
+#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)
+  // Set the Chrome cleaner mock response.
+  safe_browsing::ChromeCleanerControllerImpl::ResetInstanceForTesting();
+  safe_browsing::ChromeCleanerControllerImpl::GetInstance()->SetStateForTesting(
+      safe_browsing::ChromeCleanerController::State::kInfected);
+#endif
+
   // Check that the parent update is sent after all children checks completed.
   const base::DictionaryValue* event_parent =
       GetSafetyCheckStatusChangedWithDataIfExists(

chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc

@@ -1359,8 +1359,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
       {"safetyCheckIconWarningAriaLabel",
        IDS_SETTINGS_SAFETY_CHECK_ICON_WARNING_ARIA_LABEL},
       {"safetyCheckReview", IDS_SETTINGS_SAFETY_CHECK_REVIEW},
-      {"safetyCheckReviewErrorDetails",
-       IDS_SETTINGS_SAFETY_CHECK_REVIEW_ERROR_DETAILS},
       {"safetyCheckUpdatesPrimaryLabel",
        IDS_SETTINGS_SAFETY_CHECK_UPDATES_PRIMARY_LABEL},
       {"safetyCheckUpdatesButtonAriaLabel",
@@ -1379,8 +1377,6 @@ void AddPrivacyStrings(content::WebUIDataSource* html_source,
        IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_PRIMARY_LABEL},
       {"safetyCheckChromeCleanerButtonAriaLabel",
        IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_BUTTON_ARIA_LABEL},
-      {"safetyCheckChromeCleanerMoreButtonAriaLabel",
-       IDS_SETTINGS_SAFETY_CHECK_CHROME_CLEANER_MORE_BUTTON_ARIA_LABEL},
   };
   AddLocalizedStringsBulk(html_source, kLocalizedStrings);
 

chrome/test/data/webui/settings/BUILD.gn

@@ -136,7 +136,6 @@ js_type_check("closure_compile") {
     #":reset_profile_banner_test",
     #":route_tests",
     ":safety_check_chrome_cleaner_test",
-    ":safety_check_page_branded_windows_test",
     ":safety_check_page_test",
 
     #":search_engines_page_test",
@@ -302,15 +301,6 @@ js_library("safety_check_chrome_cleaner_test") {
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
-js_library("safety_check_page_branded_windows_test") {
-  deps = [
-    "..:chai_assert",
-    "//chrome/browser/resources/settings:settings",
-    "//ui/webui/resources/js:load_time_data.m",
-  ]
-  externs_list = [ "$externs_path/mocha-2.5.js" ]
-}
-
 js_library("safety_check_page_test") {
   deps = [
     ":test_hats_browser_proxy",

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

@@ -302,8 +302,7 @@ TEST_F('CrSettingsPasswordsCheckV3Test', 'All', function() {
 });
 
 // eslint-disable-next-line no-var
-var CrSettingsSafetyCheckPageBrandedWindowsV3Test =
-    class extends CrSettingsV3BrowserTest {
+var CrSettingsSafetyCheckPageV3Test = class extends CrSettingsV3BrowserTest {
   /** @override */
   get browsePreload() {
     return 'chrome://settings/test_loader.html?module=settings/safety_check_page_test.js';
@@ -313,47 +312,34 @@ var CrSettingsSafetyCheckPageBrandedWindowsV3Test =
   get featureListInternal() {
     return {
       enabled: [
-        'features::kSafetyCheckChromeCleanerChild',
+        'password_manager::features::kPasswordCheck',
       ],
     };
   }
 };
 
-GEN('#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)');
-TEST_F('CrSettingsSafetyCheckPageBrandedWindowsV3Test', 'All', function() {
+TEST_F('CrSettingsSafetyCheckPageV3Test', 'All', function() {
   mocha.run();
 });
-GEN('#endif  // defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)');
 
 // eslint-disable-next-line no-var
-var CrSettingsSafetyCheckPageV3Test = class extends CrSettingsV3BrowserTest {
+var CrSettingsSafetyCheckChromeCleanerV3Test =
+    class extends CrSettingsV3BrowserTest {
   /** @override */
   get browsePreload() {
-    return 'chrome://settings/test_loader.html?module=settings/safety_check_page_test.js';
+    return 'chrome://settings/test_loader.html?module=settings/safety_check_chrome_cleaner_test.js';
   }
 
   /** @override */
   get featureListInternal() {
     return {
       enabled: [
-        'password_manager::features::kPasswordCheck',
+        'features::kSafetyCheckChromeCleanerChild',
       ],
     };
   }
 };
 
-TEST_F('CrSettingsSafetyCheckPageV3Test', 'All', function() {
-  mocha.run();
-});
-
-// eslint-disable-next-line no-var
-var CrSettingsSafetyCheckChromeCleanerV3Test = class extends CrSettingsV3BrowserTest {
-  /** @override */
-  get browsePreload() {
-    return 'chrome://settings/test_loader.html?module=settings/safety_check_chrome_cleaner_test.js';
-  }
-};
-
 GEN('#if defined(OS_WIN) && BUILDFLAG(GOOGLE_CHROME_BRANDING)');
 TEST_F('CrSettingsSafetyCheckChromeCleanerV3Test', 'All', function() {
   mocha.run();

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

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 // clang-format off
+import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 import {ChromeCleanupProxy, ChromeCleanupProxyImpl} from 'chrome://settings/lazy_load.js';
@@ -53,6 +54,7 @@ function assertSafetyCheckChild({
   managedIcon
 }) {
   const safetyCheckChild = page.$$('#safetyCheckChild');
+  assertTrue(!!safetyCheckChild);
   assertTrue(safetyCheckChild.iconStatus === iconStatus);
   assertTrue(safetyCheckChild.label === label);
   assertTrue(safetyCheckChild.subLabel === testDisplayString);
@@ -73,9 +75,15 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
   /** @type {?TestMetricsBrowserProxy} */
   let metricsBrowserProxy = null;
 
-  /** @type {!SettingsSafetyCheckExtensionsChildElement} */
+  /** @type {!SettingsSafetyCheckChromeCleanerChildElement} */
   let page;
 
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      safetyCheckChromeCleanerChildEnabled: true,
+    });
+  });
+
   setup(function() {
     chromeCleanupBrowserProxy = TestBrowserProxy.fromClass(ChromeCleanupProxy);
     chromeCleanupBrowserProxy.setResultFor(
@@ -86,7 +94,7 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     MetricsBrowserProxyImpl.instance_ = metricsBrowserProxy;
 
     document.body.innerHTML = '';
-    page = /** @type {!SettingsSafetyCheckExtensionsChildElement} */ (
+    page = /** @type {!SettingsSafetyCheckChromeCleanerChildElement} */ (
         document.createElement('settings-safety-check-chrome-cleaner-child'));
     document.body.appendChild(page);
     flush();
@@ -105,6 +113,13 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     assertEquals(routes.CHROME_CLEANUP, Router.getInstance().getCurrentRoute());
   }
 
+  test('chromeCleanerHiddenUiTest', function() {
+    fireSafetyCheckChromeCleanerEvent(SafetyCheckChromeCleanerStatus.HIDDEN);
+    flush();
+    // There is no Chrome cleaner child in safety check.
+    assertFalse(!!page.$$('#safetyCheckChild'));
+  });
+
   test('chromeCleanerCheckingUiTest', function() {
     fireSafetyCheckChromeCleanerEvent(SafetyCheckChromeCleanerStatus.CHECKING);
     flush();
@@ -115,103 +130,18 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     });
   });
 
-  test('chromeCleanerSafeStatesUiTest', function() {
-    for (const state of Object.values(SafetyCheckChromeCleanerStatus)) {
-      switch (state) {
-        case SafetyCheckChromeCleanerStatus.INITIAL:
-        case SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING:
-        case SafetyCheckChromeCleanerStatus.SCANNING_FOUND_NOTHING:
-        case SafetyCheckChromeCleanerStatus.CLEANING_SUCCEEDED:
-        case SafetyCheckChromeCleanerStatus.REPORTER_RUNNING:
-        case SafetyCheckChromeCleanerStatus.SCANNING:
-          fireSafetyCheckChromeCleanerEvent(state);
-          flush();
-          assertSafetyCheckChild({
-            page: page,
-            iconStatus: SafetyCheckIconStatus.SAFE,
-            label: 'Device software',
-            buttonLabel: 'More',
-            buttonAriaLabel: 'Show details of the device software check',
-          });
-          expectChromeCleanerRouteButtonClickActions();
-          break;
-        default:
-          // Not covered by this test.
-          break;
-      }
-    }
-  });
-
-  test('chromeCleanerErrorStates', function() {
-    for (const state of Object.values(SafetyCheckChromeCleanerStatus)) {
-      switch (state) {
-        case SafetyCheckChromeCleanerStatus.REPORTER_FAILED:
-        case SafetyCheckChromeCleanerStatus.SCANNING_FAILED:
-        case SafetyCheckChromeCleanerStatus.CLEANING_FAILED:
-        case SafetyCheckChromeCleanerStatus.CLEANER_DOWNLOAD_FAILED:
-          fireSafetyCheckChromeCleanerEvent(state);
-          flush();
-          assertSafetyCheckChild({
-            page: page,
-            iconStatus: SafetyCheckIconStatus.INFO,
-            label: 'Device software',
-            buttonLabel: 'Details',
-            buttonAriaLabel: 'Review error details',
-          });
-          expectChromeCleanerRouteButtonClickActions();
-          break;
-        default:
-          // Not covered by this test.
-          break;
-      }
-    }
-  });
-
-  test('chromeCleanerInfoWithDefaultButtonStatesUiTest', function() {
-    for (const state of Object.values(SafetyCheckChromeCleanerStatus)) {
-      switch (state) {
-        case SafetyCheckChromeCleanerStatus.CLEANING:
-          fireSafetyCheckChromeCleanerEvent(state);
-          flush();
-          assertSafetyCheckChild({
-            page: page,
-            iconStatus: SafetyCheckIconStatus.INFO,
-            label: 'Device software',
-            buttonLabel: 'Review',
-            buttonAriaLabel: 'Review device software',
-          });
-          expectChromeCleanerRouteButtonClickActions();
-          break;
-        default:
-          // Not covered by this test.
-          break;
-      }
-    }
-  });
-
-  test('chromeCleanerWarningStatesUiTest', function() {
-    for (const state of Object.values(SafetyCheckChromeCleanerStatus)) {
-      switch (state) {
-        case SafetyCheckChromeCleanerStatus.USER_DECLINED_CLEANUP:
-        case SafetyCheckChromeCleanerStatus.INFECTED:
-        case SafetyCheckChromeCleanerStatus.CONNECTION_LOST:
-          fireSafetyCheckChromeCleanerEvent(state);
-          flush();
-          assertSafetyCheckChild({
-            page: page,
-            iconStatus: SafetyCheckIconStatus.WARNING,
-            label: 'Device software',
-            buttonLabel: 'Review',
-            buttonAriaLabel: 'Review device software',
-            buttonClass: 'action-button',
-          });
-          expectChromeCleanerRouteButtonClickActions();
-          break;
-        default:
-          // Not covered by this test.
-          break;
-      }
-    }
+  test('chromeCleanerInfectedTest', function() {
+    fireSafetyCheckChromeCleanerEvent(SafetyCheckChromeCleanerStatus.INFECTED);
+    flush();
+    assertSafetyCheckChild({
+      page: page,
+      iconStatus: SafetyCheckIconStatus.WARNING,
+      label: 'Device software',
+      buttonLabel: 'Review',
+      buttonAriaLabel: 'Review device software',
+      buttonClass: 'action-button',
+    });
+    expectChromeCleanerRouteButtonClickActions();
   });
 
   test('chromeCleanerRebootRequiredUiTest', function() {
@@ -232,15 +162,34 @@ suite('SafetyCheckChromeCleanerUiTests', function() {
     // Ensure the browser proxy call is done.
     return chromeCleanupBrowserProxy.whenCalled('restartComputer');
   });
+});
 
-  test('chromeCleanerDisabledByAdminUiTest', function() {
-    fireSafetyCheckChromeCleanerEvent(
-        SafetyCheckChromeCleanerStatus.DISABLED_BY_ADMIN);
-    flush();
-    assertSafetyCheckChild({
-      page: page,
-      iconStatus: SafetyCheckIconStatus.INFO,
-      label: 'Device software',
+suite('SafetyCheckChromeCleanerFlagDisabledTests', function() {
+  /** @type {!SettingsSafetyCheckChromeCleanerChildElement} */
+  let page;
+
+  suiteSetup(function() {
+    loadTimeData.overrideValues({
+      safetyCheckChromeCleanerChildEnabled: false,
     });
   });
+
+  setup(function() {
+    document.body.innerHTML = '';
+    page = /** @type {!SettingsSafetyCheckChromeCleanerChildElement} */ (
+        document.createElement('settings-safety-check-chrome-cleaner-child'));
+    document.body.appendChild(page);
+    flush();
+  });
+
+  teardown(function() {
+    page.remove();
+  });
+
+  test('testChromeCleanerNotPresent', function() {
+    fireSafetyCheckChromeCleanerEvent(SafetyCheckChromeCleanerStatus.INFECTED);
+    flush();
+    // The UI is not visible.
+    assertFalse(!!page.$$('#safetyCheckChild'));
+  });
 });

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

-// Copyright 2020 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// clang-format off
-import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
-import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
-// clang-format on
-
-suite('SafetyCheckPageChromeCleanerFlagDisabledTests', function() {
-  /** @type {!SettingsSafetyCheckPageElement} */
-  let page;
-
-  suiteSetup(function() {
-    loadTimeData.overrideValues({
-      safetyCheckChromeCleanerChildEnabled: false,
-    });
-  });
-
-  setup(function() {
-    document.body.innerHTML = '';
-    page = /** @type {!SettingsSafetyCheckPageElement} */ (
-        document.createElement('settings-safety-check-page'));
-    document.body.appendChild(page);
-    flush();
-  });
-
-  teardown(function() {
-    page.remove();
-  });
-
-  test('testChromeCleanerNotPresent', async function() {
-    // User starts check.
-    page.$$('#safetyCheckParentButton').click();
-    flush();
-    // There is no Chrome cleaner child in safety check.
-    assertFalse(!!page.$$('#chromeCleanerChild'));
-  });
-});
-
-suite('SafetyCheckPageChromeCleanerFlagEnabledTests', function() {
-  /** @type {!SettingsSafetyCheckPageElement} */
-  let page;
-
-  suiteSetup(function() {
-    loadTimeData.overrideValues({
-      safetyCheckChromeCleanerChildEnabled: true,
-    });
-  });
-
-  setup(function() {
-    document.body.innerHTML = '';
-    page = /** @type {!SettingsSafetyCheckPageElement} */ (
-        document.createElement('settings-safety-check-page'));
-    document.body.appendChild(page);
-    flush();
-  });
-
-  teardown(function() {
-    page.remove();
-  });
-
-  test('testChromeCleanerNotPresent', async function() {
-    // User starts check.
-    page.$$('#safetyCheckParentButton').click();
-    flush();
-    // There is a Chrome cleaner child in safety check.
-    assertTrue(!!page.$$('#chromeCleanerChild'));
-  });
-});

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

@@ -232,8 +232,7 @@ suite('SafetyCheckPageUiTests', function() {
         SafetyCheckSafeBrowsingStatus.ENABLED_STANDARD);
     fireSafetyCheckExtensionsEvent(
         SafetyCheckExtensionsStatus.NO_BLOCKLISTED_EXTENSIONS);
-    fireSafetyCheckChromeCleanerEvent(
-        SafetyCheckChromeCleanerStatus.REPORTER_FOUND_NOTHING);
+    fireSafetyCheckChromeCleanerEvent(SafetyCheckChromeCleanerStatus.INFECTED);
     fireSafetyCheckParentEvent(SafetyCheckParentStatus.AFTER);
 
     flush();