ProfileSyncService: merge OnCredentialsRejectedByClient into OnRefreshTokenRevoked

Before, OnRefreshTokenRevoked triggered a notification to observers, and
OnCredentialsRejectedByClient caused us to invalidate the credentials in the
SyncEngine.
In both cases, it actually seems better to do both of these things, so this CL
merges the two.

Bug: 842697
Change-Id: I81fd4578731c282284fa40cbbb0be0e1cd102656
Reviewed-on: https://chromium-review.googlesource.com/1068880
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#561419}

components/browser_sync/profile_sync_service.cc

@@ -629,18 +629,10 @@ void ProfileSyncService::OnRefreshTokenAvailable() {
 void ProfileSyncService::OnRefreshTokenRevoked() {
   DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
 
-  // TODO(treib): Should we also propagate this to the engine? It's not strictly
-  // necessary (the server will reject the token anyway), but it shoudln't hurt
-  // either, and it would let us merge this with OnCredentialsRejectedByClient.
-
-  NotifyObservers();
-}
-
-void ProfileSyncService::OnCredentialsRejectedByClient() {
-  DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
-
   if (HasSyncingEngine())
     engine_->InvalidateCredentials();
+
+  NotifyObservers();
 }
 
 void ProfileSyncService::Shutdown() {

components/browser_sync/profile_sync_service.h

@@ -488,7 +488,6 @@ class ProfileSyncService : public syncer::SyncService,
   // SyncAuthManager.
   void OnRefreshTokenAvailable();
   void OnRefreshTokenRevoked();
-  void OnCredentialsRejectedByClient();
 
   // Called by SyncAuthManager when an access token fetch attempt finishes
   // (successfully or not).

components/browser_sync/sync_auth_manager.cc

@@ -245,8 +245,9 @@ void SyncAuthManager::OnRefreshTokenAvailable(const std::string& account_id) {
     // CREDENTIALS_REJECTED_BY_CLIENT is only set by the signin component when
     // the refresh token is created.
     ClearAccessTokenAndRequest();
+    // TODO(treib): Should we also set our auth error state?
 
-    sync_service_->OnCredentialsRejectedByClient();
+    sync_service_->OnRefreshTokenRevoked();
     // TODO(treib): We can probably early-out here - no point in also calling
     // OnRefreshTokenAvailable on the ProfileSyncService.
   }