| Index: chrome/test/data/webui/settings/device_page_tests.js
|
| diff --git a/chrome/test/data/webui/settings/device_page_tests.js b/chrome/test/data/webui/settings/device_page_tests.js
|
| index c818b96d0db25b8e7776f7576fb108ba0b36c65a..dd25d487268469a121637011ba5d176725f44236 100644
|
| --- a/chrome/test/data/webui/settings/device_page_tests.js
|
| +++ b/chrome/test/data/webui/settings/device_page_tests.js
|
| @@ -246,7 +246,7 @@ cr.define('device_page_tests', function() {
|
| settings.display.systemDisplayApi = fakeSystemDisplay;
|
|
|
| PolymerTest.clearBody();
|
| - settings.navigateTo(settings.Route.BASIC);
|
| + settings.navigateTo(settings.routes.BASIC);
|
|
|
| devicePage = document.createElement('settings-device-page');
|
| devicePage.prefs = getFakePrefs();
|
| @@ -345,20 +345,20 @@ cr.define('device_page_tests', function() {
|
|
|
| setup(function() {
|
| return showAndGetDeviceSubpage(
|
| - 'pointers', settings.Route.POINTERS).then(function(page) {
|
| + 'pointers', settings.routes.POINTERS).then(function(page) {
|
| pointersPage = page;
|
| });
|
| });
|
|
|
| test('subpage responds to pointer attach/detach', function() {
|
| - assertEquals(settings.Route.POINTERS, settings.getCurrentRoute());
|
| + assertEquals(settings.routes.POINTERS, settings.getCurrentRoute());
|
| assertLT(0, pointersPage.$$('#mouse').offsetHeight);
|
| assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
|
| assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
|
| assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
|
|
|
| cr.webUIListenerCallback('has-touchpad-changed', false);
|
| - assertEquals(settings.Route.POINTERS, settings.getCurrentRoute());
|
| + assertEquals(settings.routes.POINTERS, settings.getCurrentRoute());
|
| assertLT(0, pointersPage.$$('#mouse').offsetHeight);
|
| assertEquals(0, pointersPage.$$('#touchpad').offsetHeight);
|
| assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
|
| @@ -371,12 +371,12 @@ cr.define('device_page_tests', function() {
|
|
|
| cr.webUIListenerCallback('has-mouse-changed', false);
|
| }).then(function() {
|
| - assertEquals(settings.Route.DEVICE, settings.getCurrentRoute());
|
| + assertEquals(settings.routes.DEVICE, settings.getCurrentRoute());
|
| assertEquals(0, devicePage.$$('#main #pointersRow').offsetHeight);
|
|
|
| cr.webUIListenerCallback('has-touchpad-changed', true);
|
| assertLT(0, devicePage.$$('#main #pointersRow').offsetHeight);
|
| - return showAndGetDeviceSubpage('pointers', settings.Route.POINTERS);
|
| + return showAndGetDeviceSubpage('pointers', settings.routes.POINTERS);
|
| }).then(function(page) {
|
| assertEquals(0, pointersPage.$$('#mouse').offsetHeight);
|
| assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
|
| @@ -384,7 +384,7 @@ cr.define('device_page_tests', function() {
|
| assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
|
|
|
| cr.webUIListenerCallback('has-mouse-changed', true);
|
| - assertEquals(settings.Route.POINTERS, settings.getCurrentRoute());
|
| + assertEquals(settings.routes.POINTERS, settings.getCurrentRoute());
|
| assertLT(0, pointersPage.$$('#mouse').offsetHeight);
|
| assertLT(0, pointersPage.$$('#touchpad').offsetHeight);
|
| assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
|
| @@ -460,7 +460,7 @@ cr.define('device_page_tests', function() {
|
| test(assert(TestNames.Keyboard), function() {
|
| // Open the keyboard subpage.
|
| return showAndGetDeviceSubpage(
|
| - 'keyboard', settings.Route.KEYBOARD).then(function(keyboardPage) {
|
| + 'keyboard', settings.routes.KEYBOARD).then(function(keyboardPage) {
|
| // Initially, the optional keys are hidden.
|
| expectFalse(!!keyboardPage.$$('#capsLockKey'));
|
| expectFalse(!!keyboardPage.$$('#diamondKey'));
|
| @@ -552,7 +552,7 @@ cr.define('device_page_tests', function() {
|
| return Promise.all([
|
| // Get the display sub-page.
|
| showAndGetDeviceSubpage(
|
| - 'display', settings.Route.DISPLAY).then(function(page) {
|
| + 'display', settings.routes.DISPLAY).then(function(page) {
|
| displayPage = page;
|
| }),
|
| // Wait for the initial call to getInfo.
|
| @@ -692,7 +692,7 @@ cr.define('device_page_tests', function() {
|
| });
|
|
|
| setup(function() {
|
| - return showAndGetDeviceSubpage('power', settings.Route.POWER)
|
| + return showAndGetDeviceSubpage('power', settings.routes.POWER)
|
| .then(function(page) {
|
| powerPage = page;
|
| powerSourceRow = assert(powerPage.$$('#powerSourceRow'));
|
| @@ -933,7 +933,7 @@ cr.define('device_page_tests', function() {
|
| });
|
|
|
| setup(function() {
|
| - return showAndGetDeviceSubpage('stylus', settings.Route.STYLUS).then(
|
| + return showAndGetDeviceSubpage('stylus', settings.routes.STYLUS).then(
|
| function(page) {
|
| stylusPage = page;
|
| browserProxy = settings.DevicePageBrowserProxyImpl.getInstance();
|
|
|