Treat SyncCredentialsLost as an auth error

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/bind.h"
 #include "base/basictypes.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 854 matching lines @@
       CloseOverlay();
     return;
   }
 
   // Notify services that we are now active.
   GetLoginUIService()->SetLoginUI(this);
   service->set_setup_in_progress(true);
 
   // 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).
   // 4) User is already signed in, but App Notifications needs to force another
   //    login so it can fetch an oauth token (passes force_login=true)
   // 5) User clicks [Advanced Settings] button on options page while already
   //    logged in.
   // 6) One-click signin (credentials are already available, so should display
   //    sync configure UI, not login UI).
   // 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).
     DisplayGaiaLogin(false);
   } else {
     // User is already logged in. They must have brought up the config wizard
     // via the "Advanced..." button or through One-Click signin (cases 5/6).
     DisplayConfigureSync(true, false);
   }
 #else
@@ skipping 68 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;
 }