Merge 137359 - Treat SyncCredentialsLost as an auth error

chrome/browser/signin/signin_tracker_unittest.cc

Index: chrome/browser/signin/signin_tracker_unittest.cc
===================================================================
--- chrome/browser/signin/signin_tracker_unittest.cc	(revision 137482)
+++ chrome/browser/signin/signin_tracker_unittest.cc	(working copy)
@@ -93,7 +93,7 @@
   // 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));
@@ -111,8 +111,10 @@
     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(
@@ -217,8 +219,10 @@
   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,
@@ -230,7 +234,7 @@
   // 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));
@@ -251,8 +255,10 @@
   // 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");