Override SigninManager::SignOut if force-signin is enabled.

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 d29f76905fd6f8fb68ebe0954d763ba9546fcad2..506f26639a407ff3331c2ec136494302da16ad30 100644
--- a/chrome/test/data/webui/settings/people_page_test.js
+++ b/chrome/test/data/webui/settings/people_page_test.js
@@ -154,6 +154,49 @@ cr.define('settings_people_page', function() {
 
       teardown(function() { peoplePage.remove(); });
 
+      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,
+          });
+
+          assertTrue(activityControls.hidden);
+        });
+      });
+
+      test('CustomizeSyncDisabledForManagedSignin', function() {
+        assertFalse(!!peoplePage.$$('#customize-sync'));
+
+        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'));
+
+          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'));
+        });
+      });
+
       test('GetProfileInfo', function() {
         var disconnectButton = null;
         return browserProxy.whenCalled('getSyncStatus').then(function() {
@@ -213,49 +256,6 @@ cr.define('settings_people_page', function() {
           assertTrue(deleteProfile);
         });
       });
-
-      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,
-          });
-
-          assertTrue(activityControls.hidden);
-        });
-      });
-
-      test('CustomizeSyncDisabledForManagedSignin', function() {
-        assertFalse(!!peoplePage.$$('#customize-sync'));
-
-        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'));
-
-          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'));
-        });
-      });
     });
   }