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

chrome/browser/signin/profile_oauth2_token_service.h

 // Copyright 2013 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 CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 #define CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 85 matching lines @@
 
   // Updates the internal cache of the result from the most-recently-completed
   // auth request (used for reporting errors to the user).
   virtual void UpdateAuthError(const GoogleServiceAuthError& error) OVERRIDE;
 
   // Overridden to not cache tokens if the TokenService refresh token
   // changes while a token fetch is in-flight.  If the user logs out and
   // logs back in with a different account, then any in-flight token
   // fetches will be for the old account's refresh token.  Therefore
   // when they come back, they shouldn't be cached.
-  virtual void RegisterCacheEntry(const std::string& client_id,
-                                  const std::string& refresh_token,
+  virtual void RegisterCacheEntry(const std::string& refresh_token,
                                   const ScopeSet& scopes,
                                   const std::string& access_token,
                                   const base::Time& expiration_date) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            StaleRefreshTokensNotCached);
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
                            TokenServiceUpdateClearsCache);
   FRIEND_TEST_ALL_PREFIXES(ProfileOAuth2TokenServiceTest,
@@ skipping 36 matching lines @@
   // The auth status from the most-recently-completed request.
   GoogleServiceAuthError last_auth_error_;
 
   // Registrar for notifications from the TokenService.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileOAuth2TokenService);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_PROFILE_OAUTH2_TOKEN_SERVICE_H_