Update the scopes type with ScopeSet for OnAccessTokenInvalidated

This CL is a part of moving access token management to
OAuth2AccessTokenManager.

It updates the type for scopes with ScopeSet for
OnAccessTokenInvalidated from
OAuth2AccessTokenManager::Delegate to keep consistency.

Bug: 967598
Change-Id: Ic5163c4ce12bc9eba43b46ff13b6bb43b72c7309
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725477Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Julie Jeongeun Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#682215}

components/signin/internal/identity_manager/profile_oauth2_token_service.cc

@@ -104,7 +104,7 @@ ProfileOAuth2TokenService::GetURLLoaderFactory() const {
 void ProfileOAuth2TokenService::OnAccessTokenInvalidated(
     const CoreAccountId& account_id,
     const std::string& client_id,
-    const std::set<std::string>& scopes,
+    const OAuth2AccessTokenManager::ScopeSet& scopes,
     const std::string& access_token) {
   delegate_->OnAccessTokenInvalidated(account_id, client_id, scopes,
                                       access_token);

components/signin/internal/identity_manager/profile_oauth2_token_service.h

@@ -84,10 +84,11 @@ class ProfileOAuth2TokenService : public OAuth2AccessTokenManager::Delegate,
   bool FixRequestErrorIfPossible() override;
   scoped_refptr<network::SharedURLLoaderFactory> GetURLLoaderFactory()
       const override;
-  void OnAccessTokenInvalidated(const CoreAccountId& account_id,
-                                const std::string& client_id,
-                                const std::set<std::string>& scopes,
-                                const std::string& access_token) override;
+  void OnAccessTokenInvalidated(
+      const CoreAccountId& account_id,
+      const std::string& client_id,
+      const OAuth2AccessTokenManager::ScopeSet& scopes,
+      const std::string& access_token) override;
   void OnAccessTokenFetched(const CoreAccountId& account_id,
                             const GoogleServiceAuthError& error) override;
 

components/signin/internal/identity_manager/profile_oauth2_token_service_delegate.h

@@ -17,6 +17,7 @@
 #include "components/signin/public/identity_manager/load_credentials_state.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "google_apis/gaia/oauth2_access_token_manager.h"
 #include "net/base/backoff_entry.h"
 
 namespace network {
@@ -60,10 +61,11 @@ class ProfileOAuth2TokenServiceDelegate {
   virtual std::vector<CoreAccountId> GetAccounts() const;
   virtual void RevokeAllCredentials() {}
 
-  virtual void OnAccessTokenInvalidated(const CoreAccountId& account_id,
-                                        const std::string& client_id,
-                                        const std::set<std::string>& scopes,
-                                        const std::string& access_token) {}
+  virtual void OnAccessTokenInvalidated(
+      const CoreAccountId& account_id,
+      const std::string& client_id,
+      const OAuth2AccessTokenManager::ScopeSet& scopes,
+      const std::string& access_token) {}
 
   // If refresh token is accessible (on Desktop) sets error for it to
   // INVALID_GAIA_CREDENTIALS and notifies the observers. Otherwise

google_apis/gaia/oauth2_access_token_manager.h

@@ -64,7 +64,7 @@ class OAuth2AccessTokenManager {
     // Called when an access token is invalidated.
     virtual void OnAccessTokenInvalidated(const CoreAccountId& account_id,
                                           const std::string& client_id,
-                                          const std::set<std::string>& scopes,
+                                          const ScopeSet& scopes,
                                           const std::string& access_token) {}
 
     // Called when an access token is fetched.