MD Settings: Suppress the signout dialog if user is not signed in.

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 153 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();
-            });
+          var popstatePromise = new Promise(function(resolve) {
+            listenOnce(window, 'popstate', resolve);
           });
 
           MockInteractions.tap(disconnectConfirm);
 
-          return dialogExitPromise;
+          return popstatePromise;
         }).then(function() {
           return browserProxy.whenCalled('signOut');
         }).then(function(deleteProfile) {
           assertFalse(deleteProfile);
 
           cr.webUIListenerCallback('sync-status-changed', {
             signedIn: true,
             domain: 'example.com',
           });
           Polymer.dom.flush();
 
           assertFalse(peoplePage.$.disconnectDialog.open);
           MockInteractions.tap(disconnectButton);
           Polymer.dom.flush();
 
           assertTrue(peoplePage.$.disconnectDialog.open);
           assertTrue(peoplePage.$.deleteProfile.hidden);
 
           var disconnectManagedProfileConfirm =
               peoplePage.$.disconnectManagedProfileConfirm;
           assertTrue(!!disconnectManagedProfileConfirm);
           assertFalse(disconnectManagedProfileConfirm.hidden);
 
           browserProxy.resetResolver('signOut');
+
+          var popstatePromise = new Promise(function(resolve) {
+            listenOnce(window, 'popstate', resolve);
+          });
+
           MockInteractions.tap(disconnectManagedProfileConfirm);
 
+          return popstatePromise;
+        }).then(function() {
           return browserProxy.whenCalled('signOut');
         }).then(function(deleteProfile) {
           assertTrue(deleteProfile);
         });
       });
 
+      test('Signout dialog suppressed when not signed in', function() {
+        return browserProxy.whenCalled('getSyncStatus').then(function() {
+          Polymer.dom.flush();
+
+          settings.navigateTo(settings.Route.SIGN_OUT);
+          Polymer.dom.flush();
+
+          assertTrue(peoplePage.$.disconnectDialog.open);
+
+          var popstatePromise = new Promise(function(resolve) {
+            listenOnce(window, 'popstate', resolve);
+          });
+
+          cr.webUIListenerCallback('sync-status-changed', {
+            signedIn: false,
+          });
+
+          return popstatePromise;
+        }).then(function() {
+          var popstatePromise = new Promise(function(resolve) {
+            listenOnce(window, 'popstate', resolve);
+          });
+
+          settings.navigateTo(settings.Route.SIGN_OUT);
+
+          return popstatePromise;
+        });
+      });
+
       test('ActivityControlsLink', function() {
         return browserProxy.whenCalled('getSyncStatus').then(function() {
           Polymer.dom.flush();
 
           var activityControls = peoplePage.$$('#activity-controls');
           assertTrue(!!activityControls);
           assertFalse(activityControls.hidden);
 
           cr.webUIListenerCallback('sync-status-changed', {
             signedIn: false,
@@ skipping 63 matching lines @@
   }
 
   return {
     registerTests: function() {
       registerProfileInfoTests();
       if (!cr.isChromeOS)
         registerSyncStatusTests();
     },
   };
 });