Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes)

chrome/test/data/webui/settings/people_page_sync_page_test.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('settings_people_page_sync_page', function() {
   /**
    * @constructor
    * @implements {settings.SyncBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 86 matching lines @@
           typedUrlsEnforced: false,
           typedUrlsRegistered: true,
           typedUrlsSynced: true,
         };
       }
 
       setup(function() {
         browserProxy = new TestSyncBrowserProxy();
         settings.SyncBrowserProxyImpl.instance_ = browserProxy;
 
+        // TODO(tommycli): Remove once settings.navigateTo is no longer a stub.
+        settings.navigateTo = function(route) {
+          syncPage.currentRoute = route;
+        };
+
         PolymerTest.clearBody();
         syncPage = document.createElement('settings-sync-page');
-        syncPage.currentRoute = {
-          section: 'people',
-          subpage: ['sync'],
-        };
+        settings.navigateTo(settings.Route.SYNC);
 
         document.body.appendChild(syncPage);
 
         cr.webUIListenerCallback('page-status-changed',
                                  settings.PageStatus.CONFIGURE);
         assertEquals(settings.PageStatus.CONFIGURE, syncPage.$.pages.selected);
 
         // Start with Sync All with no encryption selected.
         cr.webUIListenerCallback('sync-prefs-changed', getSyncAllPrefs());
         Polymer.dom.flush();
 
         encryptWithGoogle =
             syncPage.$$('paper-radio-button[name="encrypt-with-google"]');
         encryptWithPassphrase =
             syncPage.$$('paper-radio-button[name="encrypt-with-passphrase"]');
         assertTrue(!!encryptWithGoogle);
         assertTrue(!!encryptWithPassphrase);
       });
 
       teardown(function() { syncPage.remove(); });
 
       test('NotifiesHandlerOfNavigation', function() {
         function testNavigateAway() {
-          syncPage.currentRoute = {
-            section: 'people',
-            subpage: [],
-          };
+          settings.navigateTo(settings.Route.PEOPLE);
           return browserProxy.whenCalled('didNavigateAwayFromSyncPage');
         }
 
         function testNavigateBack() {
           browserProxy.resetResolver('didNavigateToSyncPage');
-          syncPage.currentRoute = {
-            section: 'people',
-            subpage: ['sync'],
-          };
+          settings.navigateTo(settings.Route.SYNC);
           return browserProxy.whenCalled('didNavigateToSyncPage');
         }
 
         function testDetach() {
           browserProxy.resetResolver('didNavigateAwayFromSyncPage');
           syncPage.remove();
           return browserProxy.whenCalled('didNavigateAwayFromSyncPage');
         }
 
         function testRecreate() {
           browserProxy.resetResolver('didNavigateToSyncPage');
           syncPage = document.createElement('settings-sync-page');
-          syncPage.currentRoute = {
-            section: 'people',
-            subpage: ['sync'],
-          };
+          settings.navigateTo(settings.Route.SYNC);
 
           document.body.appendChild(syncPage);
           return browserProxy.whenCalled('didNavigateToSyncPage');
         }
 
         return browserProxy.whenCalled('didNavigateToSyncPage')
             .then(testNavigateAway)
             .then(testNavigateBack)
             .then(testDetach)
             .then(testRecreate);
@@ skipping 247 matching lines @@
       });
     });
   }
 
   return {
     registerTests: function() {
       registerAdvancedSyncSettingsTests();
     },
   };
 });