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

chrome/test/data/webui/settings/people_page_test.js

Index: chrome/test/data/webui/settings/people_page_test.js
diff --git a/chrome/test/data/webui/settings/people_page_test.js b/chrome/test/data/webui/settings/people_page_test.js
index f00d12a50f9bd6e8b185cac04dbc476247ca0d92..30b423a12cb675f7222dc0ece514fd30bb25fb8a 100644
--- a/chrome/test/data/webui/settings/people_page_test.js
+++ b/chrome/test/data/webui/settings/people_page_test.js
@@ -164,12 +164,21 @@ cr.define('settings_people_page', function() {
           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', {
@@ -228,7 +237,7 @@ cr.define('settings_people_page', function() {
           var customizeSync = peoplePage.$$('#customize-sync');
           assertTrue(!!customizeSync);
           assertTrue(customizeSync.hasAttribute('actionable'));
-        }).then(function() {
+
           cr.webUIListenerCallback('sync-status-changed', {
             managed: true,
             signedIn: true,