Treat SyncCredentialsLost as an auth error

chrome/browser/signin/signin_tracker_unittest.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/signin/signin_tracker.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 75 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
       content::Source<Profile>(profile_.get()),
       content::Details<const GoogleServiceAuthError>(&error));
 }
 
 TEST_F(SigninTrackerTest, GaiaSignInSucceeded) {
   // SIGNIN_SUCCEEDED notification should lead us to get a GaiCredentialsValid()
   // callback.
   EXPECT_CALL(observer_, GaiaCredentialsValid());
-  EXPECT_CALL(*mock_pss_, AreCredentialsAvailable())
+  EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
       .WillRepeatedly(Return(false));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(false));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(profile_.get()),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 }
 
 static void ExpectSignedInSyncService(ProfileSyncServiceMock* sync_service,
                                       MockTokenService* token_service,
                                       const GoogleServiceAuthError& error) {
   if (token_service) {
     EXPECT_CALL(*token_service, HasTokenForService(_))
         .WillRepeatedly(Return(true));
   }
-  EXPECT_CALL(*sync_service, AreCredentialsAvailable()).WillRepeatedly(
+  EXPECT_CALL(*sync_service, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
+      Return(true));
+  EXPECT_CALL(*sync_service, IsSyncTokenAvailable()).WillRepeatedly(
       Return(true));
   EXPECT_CALL(*sync_service, waiting_for_auth()).WillRepeatedly(Return(false));
   EXPECT_CALL(*sync_service, GetAuthError()).WillRepeatedly(ReturnRef(error));
   EXPECT_CALL(*sync_service, unrecoverable_error_detected()).WillRepeatedly(
       Return(false));
   EXPECT_CALL(*sync_service, sync_initialized()).WillRepeatedly(Return(true));
 
 }
 
 TEST_F(SigninTrackerTest, GaiaSigninWhenServicesAlreadyRunning) {
@@ skipping 85 matching lines @@
       content::Source<TokenService>(mock_token_service_),
       content::Details<const TokenService::TokenRequestFailedDetails>(&failed));
 }
 
 TEST_F(SigninTrackerTest, NoGaiaSigninWhenServicesNotRunning) {
   // SIGNIN_SUCCEEDED notification should not result in a SigninSuccess()
   // callback if we're not already signed in.
   EXPECT_CALL(observer_, GaiaCredentialsValid());
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_pss_, AreCredentialsAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
+      Return(false));
+  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
       Return(false));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(profile_.get()),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 }
 
 TEST_F(SigninTrackerTest, GaiaSigninAfterSyncStarts) {
   // Make sure that we don't get a SigninSuccess() callback until after the
   // sync service reports that it's signed in.
   EXPECT_CALL(observer_, GaiaCredentialsValid());
-  EXPECT_CALL(*mock_pss_, AreCredentialsAvailable()).WillOnce(
+  EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillOnce(
       Return(false));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(profile_.get()),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
   Mock::VerifyAndClearExpectations(mock_pss_);
   // Mimic the sync engine getting credentials.
   EXPECT_CALL(observer_, SigninSuccess());
   GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
   ExpectSignedInSyncService(mock_pss_, mock_token_service_, error);
   tracker_->OnStateChanged();
 }
 
 TEST_F(SigninTrackerTest, SyncSigninError) {
   // Make sure that we get a SigninFailed() callback if sync gets an error after
   // initializaiton.
   EXPECT_CALL(observer_, GaiaCredentialsValid());
-  EXPECT_CALL(*mock_pss_, AreCredentialsAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
+      Return(false));
+  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
       Return(false));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(profile_.get()),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 
   // Still waiting for auth, so sync state changes should be ignored.
   EXPECT_CALL(*mock_pss_, waiting_for_auth()).WillOnce(Return(true));
   tracker_->OnStateChanged();
   // Now mimic an auth error - this should cause us to fail (not waiting for
   // auth, but still have no credentials).
   GoogleServiceAuthError error(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
   EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
   EXPECT_CALL(*mock_pss_, waiting_for_auth()).WillOnce(Return(false));
   EXPECT_CALL(observer_, SigninFailed(error));
   tracker_->OnStateChanged();
 }
 
 // TODO(kochi) Add tests with initial state != WATIING_FOR_GAIA_VALIDATION.