Reland: Settings People: Add /signOut route for Disconnect dialog.

chrome/test/data/webui/settings/people_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', function() {
   /**
    * @constructor
    * @implements {settings.ProfileInfoBrowserProxy}
    * @extends {settings.TestBrowserProxy}
    */
@@ skipping 146 matching lines @@
 
           MockInteractions.tap(disconnectButton);
           Polymer.dom.flush();
 
           assertTrue(peoplePage.$.disconnectDialog.open);
           assertFalse(peoplePage.$.deleteProfile.hidden);
 
           var disconnectConfirm = peoplePage.$.disconnectConfirm;
           assertTrue(!!disconnectConfirm);
           assertFalse(disconnectConfirm.hidden);
+
+          // Wait for exit of dialog route.
+          var dialogExitPromise = new Promise(function(resolve) {
+            window.addEventListener('popstate', function callback() {
+              window.removeEventListener('popstate', callback);
+              resolve();
+            });
+          });
+
           MockInteractions.tap(disconnectConfirm);
 
+          return dialogExitPromise;
+        }).then(function() {
           return browserProxy.whenCalled('signOut');
         }).then(function(deleteProfile) {
-          Polymer.dom.flush();
-
           assertFalse(deleteProfile);
 
           cr.webUIListenerCallback('sync-status-changed', {
             signedIn: true,
             domain: 'example.com',
           });
           Polymer.dom.flush();
 
           assertFalse(peoplePage.$.disconnectDialog.open);
           MockInteractions.tap(disconnectButton);
@@ skipping 38 matching lines @@
         return browserProxy.whenCalled('getSyncStatus').then(function() {
           cr.webUIListenerCallback('sync-status-changed', {
             signedIn: true,
             syncSystemEnabled: true,
           });
           Polymer.dom.flush();
 
           var customizeSync = peoplePage.$$('#customize-sync');
           assertTrue(!!customizeSync);
           assertTrue(customizeSync.hasAttribute('actionable'));
-        }).then(function() {
+
           cr.webUIListenerCallback('sync-status-changed', {
             managed: true,
             signedIn: true,
             syncSystemEnabled: true,
           });
           Polymer.dom.flush();
 
           var customizeSync = peoplePage.$$('#customize-sync');
           assertTrue(!!customizeSync);
           assertFalse(customizeSync.hasAttribute('actionable'));
         });
       });
     });
   }
 
   return {
     registerTests: function() {
       registerProfileInfoTests();
       if (!cr.isChromeOS)
         registerSyncStatusTests();
     },
   };
 });