[MD Settings][People] Force sign out only in the case of unrecoverable error

chrome/browser/resources/settings/people_page/sync_browser_proxy.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.
 
 /**
  * @fileoverview A helper object used from the the People section to get the
  * status of the sync backend and user preferences on what data to sync. Used
  * for both Chrome browser and ChromeOS.
  */
 cr.exportPath('settings');
@@ skipping 17 matching lines @@
  */
 settings.SyncStatus;
 
 
 /**
  * Must be kept in sync with the return values of getSyncErrorAction in
  * chrome/browser/ui/webui/settings/people_handler.cc
  * @enum {string}
  */
 settings.StatusAction = {
-  NO_ACTION: 'noAction',                 // No action to take.
-  REAUTHENTICATE: 'reauthenticate',      // User needs to reauthenticate.
-  UPGRADE_CLIENT: 'upgradeClient',       // User needs to upgrade the client.
-  ENTER_PASSPHRASE: 'enterPassphrase',   // User needs to enter passphrase.
+  NO_ACTION: 'noAction',                  // No action to take.
+  REAUTHENTICATE: 'reauthenticate',       // User needs to reauthenticate.
+  SIGNOUT_AND_SIGNIN: 'signOutAndSignIn', // User needs to sign out and sign in.
+  UPGRADE_CLIENT: 'upgradeClient',        // User needs to upgrade the client.
+  ENTER_PASSPHRASE: 'enterPassphrase',    // User needs to enter passphrase.
 };
 
 /**
  * The state of sync. This is the data structure sent back and forth between
  * C++ and JS. Its naming and structure is not optimal, but changing it would
  * require changes to the C++ handler, which is already functional.
  * @typedef {{
  *   appsEnforced: boolean,
  *   appsRegistered: boolean,
  *   appsSynced: boolean,
@@ skipping 121 matching lines @@
    * @constructor
    * @implements {settings.SyncBrowserProxy}
    */
   function SyncBrowserProxyImpl() {}
   cr.addSingletonGetter(SyncBrowserProxyImpl);
 
   SyncBrowserProxyImpl.prototype = {
 <if expr="not chromeos">
     /** @override */
     startSignIn: function() {
-      // TODO(tommycli): Currently this is always false, but this will become
-      // a parameter once supervised users are implemented in MD Settings.
-      var creatingSupervisedUser = false;
-      chrome.send('SyncSetupStartSignIn', [creatingSupervisedUser]);
+      chrome.send('SyncSetupStartSignIn');
     },
 
     /** @override */
     signOut: function(deleteProfile) {
       chrome.send('SyncSetupStopSyncing', [deleteProfile]);
     },
 
     /** @override */
     manageOtherPeople: function() {
       chrome.send('SyncSetupManageOtherPeople');
@@ skipping 39 matching lines @@
           'Signin_AccountSettings_GoogleActivityControlsClicked');
       window.open(loadTimeData.getString('activityControlsUrl'));
     }
   };
 
   return {
     SyncBrowserProxy: SyncBrowserProxy,
     SyncBrowserProxyImpl: SyncBrowserProxyImpl,
   };
 });