Update CUPS settings UI to allow USB printers to be added via discovery.

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

 // Copyright 2016 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.CupsPrintersBrowserProxy}
  * @extends {settings.TestBrowserProxy}
  */
 var TestCupsPrintersBrowserProxy = function() {
   settings.TestBrowserProxy.call(this, [
     'getCupsPrintersList',
     'getCupsPrinterManufacturersList',
-    'getCupsPrinterModelsList'
+    'getCupsPrinterModelsList',
+    'startDiscoveringPrinters',
+    'stopDiscoveringPrinters',
   ]);
 };
 
 TestCupsPrintersBrowserProxy.prototype = {
   __proto__: settings.TestBrowserProxy.prototype,
 
   printerList: [],
   manufacturers: [],
   models: [],
 
   /** @override */
   getCupsPrintersList: function() {
     this.methodCalled('getCupsPrintersList');
     return Promise.resolve(this.printerList);
   },
 
   /** @override */
   getCupsPrinterManufacturersList: function() {
     this.methodCalled('getCupsPrinterManufacturersList');
     return Promise.resolve(this.manufacturers);
   },
 
   /** @override */
   getCupsPrinterModelsList: function(manufacturer) {
     this.methodCalled('getCupsPrinterModelsList', manufacturer);
     return Promise.resolve(this.models);
   },
+
+  /** @override */
+  startDiscoveringPrinters: function() {
+    this.methodCalled('startDiscoveringPrinters');
+  },
+
+  /** @override */
+  stopDiscoveringPrinters: function() {
+    this.methodCalled('stopDiscoveringPrinters');
+  },
 };
 
 suite('CupsAddPrinterDialogTests', function() {
-  function fillDialog(addDialog) {
+  function fillAddManuallyDialog(addDialog) {
     var name = addDialog.$$('#printerNameInput');
     var address = addDialog.$$('#printerAddressInput');
 
     assertTrue(!!name);
     name.value = 'Test Printer';
 
     assertTrue(!!address);
     address.value = '127.0.0.1';
   }
 
@@ skipping 19 matching lines @@
     Polymer.dom.flush();
   });
 
   teardown(function() {
     page.remove();
     dialog = null;
     page = null;
   });
 
   /**
-   * Test that the manual add dialog is showing.
+   * Test that the discovery dialog is showing when a user initially asks
+   * to add a printer.
    */
-  test('ManualAddShowing', function() {
+  test('DiscoveryShowing', function() {
     assertFalse(!!dialog.$$('add-printer-manufacturer-model-dialog'));
     assertFalse(!!dialog.$$('add-printer-configuring-dialog'));
-    assertTrue(!!dialog.$$('add-printer-manually-dialog'));
+    assertFalse(!!dialog.$$('add-printer-manually-dialog'));
+    assertTrue(!!dialog.$$('add-printer-discovery-dialog'));
   });
 
   /**
    * Test that clicking on Add opens the model select page.
    */
   test('ValidAddOpensModelSelection', function() {
+    // Starts in discovery dialog, select add manually button.
+    var discoveryDialog = dialog.$$('add-printer-discovery-dialog');
+    assertTrue(!!discoveryDialog);
+    MockInteractions.tap(discoveryDialog.$$('.secondary-button'));
+    Polymer.dom.flush();
+
+    // Now we should be in the manually add dialog.
     var addDialog = dialog.$$('add-printer-manually-dialog');
     assertTrue(!!addDialog);
 
-    fillDialog(addDialog);
+    fillAddManuallyDialog(addDialog);
 
     MockInteractions.tap(addDialog.$$('.action-button'));
     Polymer.dom.flush();
 
     // showing model selection
     assertFalse(!!dialog.$$('add-printer-configuring-dialog'));
     assertTrue(!!dialog.$$('add-printer-manufacturer-model-dialog'));
   });
 
   /**
    * Test that getModels isn't called with a blank query.
    */
   test('NoBlankQueries', function() {
+    var discoveryDialog = dialog.$$('add-printer-discovery-dialog');
+    assertTrue(!!discoveryDialog);
+    MockInteractions.tap(discoveryDialog.$$('.secondary-button'));
+    Polymer.dom.flush();
+
     var addDialog = dialog.$$('add-printer-manually-dialog');
     assertTrue(!!addDialog);
-    fillDialog(addDialog);
+    fillAddManuallyDialog(addDialog);
 
     cupsPrintersBrowserProxy.whenCalled('getCupsPrinterModelsList')
         .then(function(manufacturer) { assertGT(0, manufacturer.length); });
 
     cupsPrintersBrowserProxy.manufacturers =
         ['ManufacturerA', 'ManufacturerB', 'Chromites'];
     MockInteractions.tap(addDialog.$$('.action-button'));
     Polymer.dom.flush();
 
     var modelDialog = dialog.$$('add-printer-manufacturer-model-dialog');
     assertTrue(!!modelDialog);
 
     return cupsPrintersBrowserProxy.whenCalled(
         'getCupsPrinterManufacturersList');
   });
 });