Simplified print preview printer selection to be more consistent with Chrome

chrome/test/data/webui/print_preview.js

 // Copyright (c) 2011 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.
 
 /**
  * Test fixture for print preview WebUI testing.
  * @extends {testing.Test}
  * @constructor
  */
 function PrintPreviewWebUITest() {}
@@ skipping 217 matching lines @@
   expectEquals('FooDevice', printerList.options[fooIndex].value,
                'fooIndex=' + fooIndex);
   expectEquals('BarName', printerList.options[barIndex].text,
                'barIndex=' + barIndex);
   expectEquals('BarDevice', printerList.options[barIndex].value,
                'barIndex=' + barIndex);
 });
 
 // Test that the printer list is structured correctly after calling
 // addCloudPrinters with an empty list.
-TEST_F('PrintPreviewWebUITest', 'FLAKY_TestPrinterListCloudEmpty', function() {
-  addCloudPrinters([]);
+TEST_F('PrintPreviewWebUITest', 'TestPrinterListCloudEmpty', function() {
+  cloudprint.addCloudPrinters([], addDestinationListOptionAtPosition);
   var printerList = $('printer-list');
   assertNotEquals(null, printerList);
-  expectEquals(localStrings.getString('cloudPrinters'),
-               printerList.options[0].text);
-  expectEquals(localStrings.getString('addCloudPrinter'),
-               printerList.options[1].text);
 });
 
 // Test that the printer list is structured correctly after calling
 // addCloudPrinters with a null list.
-TEST_F('PrintPreviewWebUITest', 'FLAKY_TestPrinterListCloudNull', function() {
-  addCloudPrinters(null);
+TEST_F('PrintPreviewWebUITest', 'TestPrinterListCloudNull', function() {
+  cloudprint.addCloudPrinters(null, addDestinationListOptionAtPosition);
   var printerList = $('printer-list');
   assertNotEquals(null, printerList);
-  expectEquals(localStrings.getString('cloudPrinters'),
+  expectEquals(localStrings.getString('signIn'),
                printerList.options[0].text);
-  expectEquals(localStrings.getString('signIn'),
-               printerList.options[1].text);
 });
 
 // Test that the printer list is structured correctly after attempting to add
 // individual cloud printers until no more can be added.
-TEST_F('PrintPreviewWebUITest', 'FLAKY_TestPrinterListCloud', function() {
+TEST_F('PrintPreviewWebUITest', 'TestPrinterListCloud', function() {
   var printerList = $('printer-list');
   assertNotEquals(null, printerList);
   var printer = new Object;
   printer['name'] = 'FooCloud';
   for (var i = 0; i < maxCloudPrinters; i++) {
     printer['id'] = String(i);
-    addCloudPrinters([printer]);
-    expectEquals(localStrings.getString('cloudPrinters'),
-                 printerList.options[0].text);
-    expectEquals('FooCloud', printerList.options[i + 1].text);
-    expectEquals(String(i), printerList.options[i + 1].value);
+    cloudprint.addCloudPrinters([printer], addDestinationListOptionAtPosition);
+    expectEquals('FooCloud', printerList.options[i].text);
+    expectEquals(String(i), printerList.options[i].value);
   }
-  printer['id'] = maxCloudPrinters + 1;
-  addCloudPrinters([printer]);
-  expectEquals('', printerList.options[maxCloudPrinters + 1].text);
-  expectEquals(localStrings.getString('morePrinters'),
-               printerList.options[maxCloudPrinters + 2].text);
+  cloudprint.addCloudPrinters([printer], addDestinationListOptionAtPosition);
+  expectNotEquals('FooCloud', printerList.options[i].text);
+  expectNotEquals(String(i), printerList.options[i].value);
+  for (var i = 0; i < maxCloudPrinters; i++) {
+    expectEquals('FooCloud', printerList.options[i].text);
+    expectEquals(String(i), printerList.options[i].value);
+  }
 });
 
 /**
  * Verify that |section| visibility matches |visible|.
  * @param {HTMLDivElement} section The section to check.
  * @param {boolean} visible The expected state of visibility.
  */
 function checkSectionVisible(section, visible) {
   assertNotEquals(null, section);
   expectEquals(section.classList.contains('visible'), visible,
@@ skipping 156 matching lines @@
 
 // Test that error message is displayed when plugin doesn't exist.
 TEST_F('PrintPreviewNoPDFWebUITest', 'TestErrorMessage', function() {
   var errorButton = $('error-button');
   assertNotEquals(null, errorButton);
   expectFalse(errorButton.disabled);
   var errorText = $('custom-message');
   assertNotEquals(null, errorText);
   expectFalse(errorText.classList.contains('hidden'));
 });