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

chrome/browser/signin/profile_oauth2_token_service.cc

 // 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.
 
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
@@ skipping 150 matching lines @@
       NOTREACHED() << "Invalid notification type=" << type;
       break;
   }
 }
 
 GoogleServiceAuthError ProfileOAuth2TokenService::GetAuthStatus() const {
   return last_auth_error_;
 }
 
 void ProfileOAuth2TokenService::RegisterCacheEntry(
-    const std::string& client_id,
     const std::string& refresh_token,
     const ScopeSet& scopes,
     const std::string& access_token,
     const base::Time& expiration_date) {
   if (ShouldCacheForRefreshToken(TokenServiceFactory::GetForProfile(profile_),
                                  refresh_token)) {
-    OAuth2TokenService::RegisterCacheEntry(client_id,
-                                           refresh_token,
+    OAuth2TokenService::RegisterCacheEntry(refresh_token,
                                            scopes,
                                            access_token,
                                            expiration_date);
   }
 }
 
 bool ProfileOAuth2TokenService::ShouldCacheForRefreshToken(
     TokenService *token_service,
     const std::string& refresh_token) {
   if (!token_service ||
@@ skipping 126 matching lines @@
     }
   }
 
   if (!old_login_token.empty() &&
       refresh_tokens_.count(GetAccountId(profile_)) == 0) {
     UpdateCredentials(GetAccountId(profile_), old_login_token);
   }
 
   FireRefreshTokensLoaded();
 }