Cleanup Tool WebUI: Add logs upload checkbox and minor polishing

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

 // Copyright 2017 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.
 
 /**
  * @constructor
  * @implements {settings.ChromeCleanupProxy}
  * @extends {TestBrowserProxy}
  */
 var TestChromeCleanupProxy = function() {
   TestBrowserProxy.call(this, [
     'dismissCleanupPage',
     'registerChromeCleanerObserver',
     'restartComputer',
+    'setLogsUploadPermission',
     'startCleanup',
   ]);
 };
 
 TestChromeCleanupProxy.prototype = {
   __proto__: TestBrowserProxy.prototype,
 
   /** @override */
   dismissCleanupPage: function() {
     this.methodCalled('dismissCleanupPage');
   },
 
   /** @override */
   registerChromeCleanerObserver: function() {
     this.methodCalled('registerChromeCleanerObserver');
   },
 
   /** @override */
   restartComputer: function() {
     this.methodCalled('restartComputer');
   },
 
   /** @override */
-  startCleanup: function() {
-    this.methodCalled('startCleanup');
+  setLogsUploadPermission: function(enabled) {
+    this.methodCalled('setLogsUploadPermission', enabled);
   },
+
+  /** @override */
+  startCleanup: function(logs_upload_enabled) {
+    this.methodCalled('startCleanup', logs_upload_enabled);
+  }
 };
 
 var chromeCleanupPage = null;
 
 /** @type {?TestDownloadsBrowserProxy} */
 var ChromeCleanupProxy = null;
 
 suite('ChromeCleanupHandler', function() {
   setup(function() {
     ChromeCleanupProxy = new TestChromeCleanupProxy();
     settings.ChromeCleanupProxyImpl.instance_ = ChromeCleanupProxy;
 
     PolymerTest.clearBody();
 
     chromeCleanupPage = document.createElement('settings-chrome-cleanup-page');
     document.body.appendChild(chromeCleanupPage);
   });
 
   teardown(function() {
     chromeCleanupPage.remove();
   });
 
   test('startCleanupFromInfected', function() {
+    cr.webUIListenerCallback('chrome-cleanup-upload-permission-change', false);
     cr.webUIListenerCallback(
         'chrome-cleanup-on-infected', ['file 1', 'file 2', 'file 3']);
     Polymer.dom.flush();
 
     var showFilesButton = chromeCleanupPage.$$('#show-files-button');
     assertTrue(!!showFilesButton);
     MockInteractions.tap(showFilesButton);
     filesToRemove = chromeCleanupPage.$$('#files-to-remove-list');
     assertTrue(!!filesToRemove);
     assertEquals(filesToRemove.getElementsByTagName('li').length, 3);
 
     var actionButton = chromeCleanupPage.$$('#action-button');
     assertTrue(!!actionButton);
     MockInteractions.tap(actionButton);
-    ChromeCleanupProxy.whenCalled('startCleanup').then(function() {
-      cr.webUIListenerCallback('chrome-cleanup-on-cleaning', false);
-      Polymer.dom.flush();
+    ChromeCleanupProxy.whenCalled('startCleanup').then(
+      function(logs_upload_enabled) {

[ftirelo, 2017/07/05 19:02:26]

logsUploadEnabled?

[proberge, 2017/07/05 20:14:21]

Done.

+        assertFalse(logs_upload_enabled);
+        cr.webUIListenerCallback('chrome-cleanup-on-cleaning', false);
+        Polymer.dom.flush();
 
-      var spinner = chromeCleanupPage.$$('#cleaning-spinner');
-      assertTrue(spinner.active);
-    })
+        var spinner = chromeCleanupPage.$$('#cleaning-spinner');
+        assertTrue(spinner.active);
+      })
   });
 
   test('rebootFromRebootRequired', function() {
     cr.webUIListenerCallback('chrome-cleanup-on-reboot-required');
     Polymer.dom.flush();
 
     var actionButton = chromeCleanupPage.$$('#action-button');
     assertTrue(!!actionButton);
     MockInteractions.tap(actionButton);
     return ChromeCleanupProxy.whenCalled('restartComputer');
@@ skipping 17 matching lines @@
     cr.webUIListenerCallback(
         'chrome-cleanup-on-idle',
         settings.ChromeCleanupIdleReason.CLEANING_SUCCEEDED);
     Polymer.dom.flush();
 
     var actionButton = chromeCleanupPage.$$('#action-button');
     assertTrue(!!actionButton);
     MockInteractions.tap(actionButton);
     return ChromeCleanupProxy.whenCalled('dismissCleanupPage');
   });
+
+  test('setLogsUploadPermission', function() {
+    cr.webUIListenerCallback(
+        'chrome-cleanup-on-infected', ['file 1', 'file 2', 'file 3']);
+    Polymer.dom.flush();
+
+    var control = chromeCleanupPage.$$('#logsUploadControl');
+    assertTrue(!!control);
+
+    cr.webUIListenerCallback('chrome-cleanup-upload-permission-change', true);
+    Polymer.dom.flush();
+    assertTrue(control.checked);
+
+    cr.webUIListenerCallback('chrome-cleanup-upload-permission-change', false);
+    Polymer.dom.flush();
+    assertFalse(control.checked);
+
+    // TODO(proberge): This tap doesn't seem to do anything and the test hangs
+    // on the whenCalled below.
+    // Manually clicking on the control if pixel-output is enabled resolves the
+    // whenCalled and successfully completes the test.
+    MockInteractions.tap(control);
+
+    return ChromeCleanupProxy.whenCalled('setLogsUploadPermission').then(
+      function(enabled) {
+        assertTrue(enabled);
+      });
+  });
 });