Revert "Handling of multiple concurrent requests from different clients in OAuth2TokenService"

google_apis/gaia/oauth2_access_token_fetcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_
 #define GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 class OAuth2AccessTokenFetcherTest;
 
 namespace base {
 class Time;
 }
 
 namespace net {
 class URLFetcher;
 class URLRequestContextGetter;
 class URLRequestStatus;
 }
 
-namespace policy {
-  class UserPolicySigninServiceTest;
-}
-
 // Abstracts the details to get OAuth2 access token token from
 // OAuth2 refresh token.
 // See "Using the Refresh Token" section in:
 // http://code.google.com/apis/accounts/docs/OAuth2WebServer.html
 //
 // This class should be used on a single thread, but it can be whichever thread
 // that you like.
 // Also, do not reuse the same instance. Once Start() is called, the instance
 // should not be reused.
 //
@@ skipping 48 matching lines @@
   static GURL MakeGetAccessTokenUrl();
   static std::string MakeGetAccessTokenBody(
       const std::string& client_id,
       const std::string& client_secret,
       const std::string& refresh_token,
       const std::vector<std::string>& scopes);
   static bool ParseGetAccessTokenResponse(const net::URLFetcher* source,
                                           std::string* access_token,
                                           int* expires_in);
 
-  // Resets |last_fetcher_id_| to 0.
-  static void ResetLastFetcherIdForTest();
-
   // State that is set during construction.
   OAuth2AccessTokenConsumer* const consumer_;
   net::URLRequestContextGetter* const getter_;
   State state_;
 
   // While a fetch is in progress.
   scoped_ptr<net::URLFetcher> fetcher_;
   std::string client_id_;
   std::string client_secret_;
   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 class policy::UserPolicySigninServiceTest;
   FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,
                            ParseGetAccessTokenResponse);
   FRIEND_TEST_ALL_PREFIXES(OAuth2AccessTokenFetcherTest,
                            MakeGetAccessTokenBody);
 
   DISALLOW_COPY_AND_ASSIGN(OAuth2AccessTokenFetcher);
 };
 
 #endif  // GOOGLE_APIS_GAIA_OAUTH2_ACCESS_TOKEN_FETCHER_H_