MD Settings: Add display layout

chrome/test/data/webui/settings/device_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.
 
 cr.define('device_page_tests', function() {
   /** @enum {string} */
   var TestNames = {
     Display: 'display',
     Keyboard: 'keyboard',
     Touchpad: 'touchpad',
@@ skipping 293 matching lines @@
 
       var displayPage;
       return Promise.all([
         // Get the display sub-page.
         showAndGetDeviceSubpage('display').then(function(page) {
           displayPage = page;
         }),
         // Wait for the initial call to getInfo.
         fakeSystemDisplay.getInfoCalled.promise,
       ]).then(function() {
-        expectTrue(!!displayPage.displays);
-        expectEquals(0, displayPage.displays.length);
-
         // Add a display.
         addDisplay(1);
         fakeSystemDisplay.onDisplayChanged.callListeners();
 
-        return new Promise(function(resolve, reject) {
-          setTimeout(resolve);
-        });
+        return Promise.all([
+          fakeSystemDisplay.getInfoCalled.promise,
+          fakeSystemDisplay.getLayoutCalled.promise,
+          new Promise(function(resolve, reject) { setTimeout(resolve); })
+        ]);
       }).then(function() {
         // There should be a single display which should be primary and
         // selected. Mirroring should be disabled.
         expectEquals(1, displayPage.displays.length);
         expectEquals(
             displayPage.displays[0].id, displayPage.selectedDisplay.id);
         expectEquals(
             displayPage.displays[0].id, displayPage.primaryDisplayId);
         expectFalse(displayPage.showMirror_(displayPage.displays));
         expectFalse(displayPage.isMirrored_(displayPage.displays));
 
         // Add a second display.
         addDisplay(2);
         fakeSystemDisplay.onDisplayChanged.callListeners();
 
-        return new Promise(function(resolve, reject) {
-          setTimeout(resolve);
-        });
+        return Promise.all([
+          fakeSystemDisplay.getInfoCalled.promise,
+          fakeSystemDisplay.getLayoutCalled.promise,
+          new Promise(function(resolve, reject) { setTimeout(resolve); })
+        ]);
       }).then(function() {
         // There should be two displays, the first should be primary and
         // selected. Mirroring should be enabled but set to false.
         expectEquals(2, displayPage.displays.length);
         expectEquals(
             displayPage.displays[0].id, displayPage.selectedDisplay.id);
         expectEquals(displayPage.displays[0].id, displayPage.primaryDisplayId);
         expectTrue(displayPage.showMirror_(displayPage.displays));
         expectFalse(displayPage.isMirrored_(displayPage.displays));
 
         // Select the second display and make it primary. Also change the
         // orientation of the second display.
-        MockInteractions.tap(displayPage.$$('#fakeDisplayId2'));
+        var displayLayout = displayPage.$$('#displayLayout');
+        assertTrue(!!displayLayout);
+        var displayDiv = displayLayout.$$('#_fakeDisplayId2');
+        assertTrue(!!displayDiv);
+        MockInteractions.tap(displayDiv);
         expectEquals(
             displayPage.displays[1].id, displayPage.selectedDisplay.id);
 
         displayPage.onMakePrimaryTap_();
         displayPage.onSetOrientation_({detail: {selected: '90'}});
         fakeSystemDisplay.onDisplayChanged.callListeners();
 
-        return new Promise(function(resolve, reject) {
-          setTimeout(resolve);
-        });
+        return Promise.all([
+          fakeSystemDisplay.getInfoCalled.promise,
+          fakeSystemDisplay.getLayoutCalled.promise,
+          new Promise(function(resolve, reject) { setTimeout(resolve); })
+        ]);
       }).then(function() {
         // Confirm that the second display is selected, primary, and rotated.
         expectEquals(2, displayPage.displays.length);
         expectEquals(
             displayPage.displays[1].id, displayPage.selectedDisplay.id);
         expectTrue(displayPage.displays[1].isPrimary);
         expectEquals(displayPage.displays[1].id, displayPage.primaryDisplayId);
         expectEquals(90, displayPage.displays[1].rotation);
 
         // Mirror the displays.
         displayPage.onMirroredTap_();
         fakeSystemDisplay.onDisplayChanged.callListeners();
 
-        return new Promise(function(resolve, reject) {
-          setTimeout(resolve);
-        });
+        return Promise.all([
+          fakeSystemDisplay.getInfoCalled.promise,
+          fakeSystemDisplay.getLayoutCalled.promise,
+          new Promise(function(resolve, reject) { setTimeout(resolve); })
+        ]);
       }).then(function() {
         // Confirm that there is now only one display and that it is primary
         // and mirroring is enabled.
         expectEquals(1, displayPage.displays.length);
         expectEquals(
             displayPage.displays[0].id, displayPage.selectedDisplay.id);
         expectTrue(displayPage.displays[0].isPrimary);
         expectTrue(displayPage.showMirror_(displayPage.displays));
         expectTrue(displayPage.isMirrored_(displayPage.displays));
       });
     });
   });
 
   return {
     TestNames: TestNames
   };
 });