Handling of multiple concurrent requests from different clients in OAuth2TokenService

google_apis/gaia/oauth2_access_token_fetcher.h

Index: google_apis/gaia/oauth2_access_token_fetcher.h
diff --git a/google_apis/gaia/oauth2_access_token_fetcher.h b/google_apis/gaia/oauth2_access_token_fetcher.h
index 11ac6ea8b5c702a9611802b444444fdf7c80cce4..0677c8860029b1ecb7fe8c9f5a9741744953d5b6 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher.h
+++ b/google_apis/gaia/oauth2_access_token_fetcher.h
@@ -94,6 +94,9 @@ class OAuth2AccessTokenFetcher : public net::URLFetcherDelegate {
                                           std::string* access_token,
                                           int* expires_in);
 
+  // Resets |last_fetcher_id_| to 0.
+  static void ResetLastFetcherIdForTest();

[fgorski, 2013/08/29 23:37:44]

To check in you will either need to make the method public or friend
UserPolicySigninServiceTest.SignOutThenSignInAgain, and add a reset in line 788
of that file.

+
   // State that is set during construction.
   OAuth2AccessTokenConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
@@ -106,7 +109,11 @@ class OAuth2AccessTokenFetcher : public net::URLFetcherDelegate {
   std::string refresh_token_;
   std::vector<std::string> scopes_;
 
+  // The last fetcher id.
+  static int last_fetcher_id_;
+
   friend class OAuth2AccessTokenFetcherTest;
+  friend class OAuth2TokenServiceTest;
   FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,
                            ParseGetAccessTokenResponse);
   FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,