Treat SyncCredentialsLost as an auth error

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 c3b95dae6377da510be8e331aa066d00ce050026..5a1a63375252efe929a55e3d5567898ce0248cd4 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -872,7 +872,7 @@ void SyncSetupHandler::OpenSyncSetup(bool force_login) {
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo (passes force_login=true)
-  // 2) Normal signin through options page (AreCredentialsAvailable() will
+  // 2) Normal signin through options page (IsSyncEnabledAndLoggedIn() will
   //    return false).
   // 3) Previously working credentials have expired
   //    (service->GetAuthError() != NONE).
@@ -885,7 +885,8 @@ void SyncSetupHandler::OpenSyncSetup(bool force_login) {
   // 7) ChromeOS re-enable after disabling sync.
 #if !defined(OS_CHROMEOS)
   if (force_login ||
-      !service->AreCredentialsAvailable() ||
+      !service->IsSyncEnabledAndLoggedIn() ||
+      !service->IsSyncTokenAvailable() ||

[Nicolas Zea, 2012/05/15 23:39:04]

Do we want to check the token here? Presumably if the token isn't available, but
sync is running, then we need to wait for an auth error anyways. If we don't,
then when we succeed in logging in, we won't detect a change in connection
status and will infinite spin right?

[Andrew T Wilson (Slow), 2012/05/16 01:05:16]

It shouldn't matter if we check both or not (and it won't lead to infinite spin
because we no longer wait for a sync backend state transition if sync isn't
reporting an auth error).

However, it's probably safer not to check for the presence of the sync token
here just in case the user tries to bring up the settings UI before the token DB
has finished loading.

       service->GetAuthError().state() != GoogleServiceAuthError::NONE) {
     // User is not logged in, or login has been specially requested - need to
     // display login UI (cases 1-4).