Updated SigninManager and TokenService to generate notifications at signout.

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 851 matching lines @@
     // Let the various services know that we're no longer active.
     GetLoginUIService()->LoginUIClosed(this);
     if (sync_service)
       sync_service->set_setup_in_progress(false);
 
     // Make sure user isn't left half-logged-in (signed in, but without sync
     // started up). If the user hasn't finished setting up sync, then sign out
     // 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
     }
   }
 
   // Reset the attempted email address and error, otherwise the sync setup
   // overlay in the settings page will stay in whatever error state it was last
   // when it is reopened.
   last_attempted_user_email_.clear();
@@ skipping 132 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }