Settings Router Refactor: Kill settings-router.

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 = {
     DevicePage: 'device page',
     Display: 'display',
     Keyboard: 'keyboard',
@@ skipping 124 matching lines @@
   suite('SettingsDevicePage', function() {
     /** @type {!SettingsDevicePage|undefined} */
     var devicePage;
 
     /** @type {!FakeSystemDisplay|undefined} */
     var fakeSystemDisplay;
 
     suiteSetup(function() {
       // Disable animations so sub-pages open within one event loop.
       testing.Test.disableAnimationsAndTransitions();
-
-      // Update the device page route for navigations.
-      // TODO(tommycli): Remove once settings.navigateTo is no longer a stub.
-      settings.navigateTo = function(route) {
-        devicePage.currentRoute = route;
-      };
     });
 
     setup(function(done) {
       fakeSystemDisplay = new settings.FakeSystemDisplay();
       settings.display.systemDisplayApi = fakeSystemDisplay;
 
       PolymerTest.clearBody();
       devicePage = document.createElement('settings-device-page');
-      devicePage.currentRoute = settings.Route.BASIC;
       devicePage.prefs = getFakePrefs();
       settings.DevicePageBrowserProxyImpl.instance_ =
           new TestDevicePageBrowserProxy();
 
       // settings-animated-pages expects a parent with data-page set.
       var basicPage = document.createElement('div');
       basicPage.dataset.page = 'basic';
       basicPage.appendChild(devicePage);
       document.body.appendChild(basicPage);
 
       // Allow the light DOM to be distributed to settings-animated-pages.
       setTimeout(done);
     });
 
     /** @return {!Promise<!HTMLElement>} */
     function showAndGetDeviceSubpage(subpage) {
       return new Promise(function(resolve, reject) {
         var row = assert(devicePage.$$('#main #' + subpage + 'Row'));
         devicePage.$.pages.addEventListener('neon-animation-finish', resolve);
         MockInteractions.tap(row);
       }).then(function() {
-        assertEquals('device', devicePage.currentRoute.section);
-        assertEquals(subpage, devicePage.currentRoute.subpage[0]);
+        assertEquals('device', settings.getCurrentRoute().section);
+        assertEquals(subpage, settings.getCurrentRoute().subpage[0]);
         var page = devicePage.$$('#' + subpage + ' settings-' + subpage);
         return assert(page);
       });
     };
 
     /**
      * @param {!HTMLElement} pointersPage
      * @param {Boolean} expected
      */
     function expectNaturalScrollValue(pointersPage, expected) {
@@ skipping 26 matching lines @@
     suite(assert(TestNames.Pointers), function() {
       var pointersPage;
 
       setup(function() {
         return showAndGetDeviceSubpage('pointers').then(function(page) {
           pointersPage = page;
         });
       });
 
       test('subpage responds to pointer attach/detach', function() {
-        assertEquals('pointers', devicePage.currentRoute.subpage[0]);
-        assertTrue(devicePage.currentRoute == settings.Route.POINTERS);
+        assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
+        assertTrue(settings.getCurrentRoute() == settings.Route.POINTERS);
         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('pointers', devicePage.currentRoute.subpage[0]);
+        assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
         assertLT(0, pointersPage.$.mouse.offsetHeight);
         assertEquals(0, pointersPage.$.touchpad.offsetHeight);
         assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
         assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
 
         // Wait for the transition back to the main page.
         return new Promise(function(resolve, reject) {
           devicePage.$.pages.addEventListener('neon-animation-finish', resolve);
 
           cr.webUIListenerCallback('has-mouse-changed', false);
         }).then(function() {
-          assertEquals(0, devicePage.currentRoute.subpage.length);
+          assertEquals(0, settings.getCurrentRoute().subpage.length);
           assertEquals(0, devicePage.$$('#main #pointersRow').offsetHeight);
 
           cr.webUIListenerCallback('has-touchpad-changed', true);
           assertLT(0, devicePage.$$('#main #pointersRow').offsetHeight);
           return showAndGetDeviceSubpage('pointers');
         }).then(function(page) {
           assertEquals(0, pointersPage.$.mouse.offsetHeight);
           assertLT(0, pointersPage.$.touchpad.offsetHeight);
           assertEquals(0, pointersPage.$$('#mouse h2').offsetHeight);
           assertEquals(0, pointersPage.$$('#touchpad h2').offsetHeight);
 
           cr.webUIListenerCallback('has-mouse-changed', true);
-          assertEquals('pointers', devicePage.currentRoute.subpage[0]);
+          assertEquals('pointers', settings.getCurrentRoute().subpage[0]);
           assertLT(0, pointersPage.$.mouse.offsetHeight);
           assertLT(0, pointersPage.$.touchpad.offsetHeight);
           assertLT(0, pointersPage.$$('#mouse h2').offsetHeight);
           assertLT(0, pointersPage.$$('#touchpad h2').offsetHeight);
         });
       });
 
       test('mouse', function() {
         expectLT(0, pointersPage.$.mouse.offsetHeight);
 
@@ skipping 245 matching lines @@
         expectTrue(displayPage.showMirror_(displayPage.displays));
         expectTrue(displayPage.isMirrored_(displayPage.displays));
       });
     });
   });
 
   return {
     TestNames: TestNames
   };
 });