Updated SigninManager and TokenService to generate notifications at signout.

chrome/browser/ui/webui/sync_setup_handler.cc

Index: chrome/browser/ui/webui/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 44dcb5bffc3f48d2d00d255ca165dce3dfb58d38..7e53b8e6a26d9542fc9482d28f7d27058f7b29e5 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -869,11 +869,13 @@ void SyncSetupHandler::CloseSyncSetup() {
     // and shut down sync.
     if (sync_service && !sync_service->HasSyncSetupCompleted()) {
       DVLOG(1) << "Signin aborted by user action";
+      // Calling DisableForUser() will also sign the user out on desktop
+      // platforms (platforms without sync auto-start enabled).
       sync_service->DisableForUser();
-#if !defined(OS_CHROMEOS)
-      GetSignin()->SignOut();
-#else
-      // TODO(atwilson): Move this suppression to PSS::DisableForUser()
+
+#if defined(OS_CHROMEOS)
+      // Suppress sync startup on ChromeOS, so it doesn't get restarted when
+      // the user logs in again.
       browser_sync::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
       sync_prefs.SetStartSuppressed(true);
 #endif