[sync] Separate sign in from sync on Desktop Chrome

chrome/browser/signin/signin_tracker_unittest.cc

Index: chrome/browser/signin/signin_tracker_unittest.cc
diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc
index 2153887844b242c239c76dd5124f57a55b6b3915..9aa4c27afdd69e1c2e5cae6dbe78d2939d6f2f50 100644
--- a/chrome/browser/signin/signin_tracker_unittest.cc
+++ b/chrome/browser/signin/signin_tracker_unittest.cc
@@ -109,6 +109,8 @@ TEST_F(SigninTrackerTest, GaiaSignInSucceeded) {
   EXPECT_CALL(observer_, GaiaCredentialsValid());
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn())
       .WillRepeatedly(Return(false));
+  const GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
+  EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(false));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
@@ -239,6 +241,8 @@ TEST_F(SigninTrackerTest, NoGaiaSigninWhenServicesNotRunning) {
       Return(false));
   EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
       Return(false));
+  const GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
+  EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
@@ -252,6 +256,8 @@ TEST_F(SigninTrackerTest, GaiaSigninAfterSyncStarts) {
   EXPECT_CALL(observer_, GaiaCredentialsValid());
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillOnce(
       Return(false));
+  const GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
+  EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
   mock_signin_manager_->SetAuthenticatedUsername("username@gmail.com");
@@ -263,19 +269,20 @@ TEST_F(SigninTrackerTest, GaiaSigninAfterSyncStarts) {
   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.
+  // initialization.
   EXPECT_CALL(observer_, GaiaCredentialsValid());
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(false));
   EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
       Return(false));
+  const GoogleServiceAuthError no_error(GoogleServiceAuthError::NONE);
+  EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(no_error));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
   mock_signin_manager_->SetAuthenticatedUsername("username@gmail.com");
@@ -295,6 +302,7 @@ TEST_F(SigninTrackerTest, SyncSigninError) {
   FakeAuthStatusProvider provider(mock_signin_manager_->signin_global_error());
   provider.SetAuthError(error);
   EXPECT_CALL(*mock_pss_, waiting_for_auth()).WillRepeatedly(Return(false));
+  EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
   EXPECT_CALL(observer_, SigninFailed(error));
   tracker_->OnStateChanged();
 }