Make OAuth2TokenService::Request class multi-login aware.

chrome/browser/chromeos/settings/device_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/chromeos/settings/device_oauth2_token_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_registry_simple.h"
@@ skipping 20 matching lines @@
 // through to the target Consumer unless the refresh token validation is
 // complete. Additionally derives from the RequestImpl, so that it
 // can be passed back to the caller and directly deleted when cancelling
 // the request.
 class DeviceOAuth2TokenService::ValidatingConsumer
     : public OAuth2TokenService::Consumer,
       public OAuth2TokenService::RequestImpl,
       public gaia::GaiaOAuthClient::Delegate {
  public:
   explicit ValidatingConsumer(DeviceOAuth2TokenService* token_service,
+                              const std::string& account_id,
                               Consumer* consumer);
   virtual ~ValidatingConsumer();
 
   void StartValidation();
 
   // OAuth2TokenService::Consumer
   virtual void OnGetTokenSuccess(
       const Request* request,
       const std::string& access_token,
       const base::Time& expiration_time) OVERRIDE;
@@ skipping 27 matching lines @@
 
   // OAuth2TokenService::Consumer results
   bool token_fetch_done_;
   std::string access_token_;
   base::Time expiration_time_;
   scoped_ptr<GoogleServiceAuthError> error_;
 };
 
 DeviceOAuth2TokenService::ValidatingConsumer::ValidatingConsumer(
     DeviceOAuth2TokenService* token_service,
+    const std::string& account_id,
     Consumer* consumer)
-        : OAuth2TokenService::RequestImpl(this),
+        : OAuth2TokenService::RequestImpl(account_id, this),
           token_service_(token_service),
           consumer_(consumer),
           token_validation_done_(false),
           token_is_valid_(false),
           token_fetch_done_(false) {
 }
 
 DeviceOAuth2TokenService::ValidatingConsumer::~ValidatingConsumer() {
 }
 
@@ skipping 169 matching lines @@
     return connector->GetDeviceCloudPolicyManager()->GetRobotAccountId();
   return std::string();
 }
 
 net::URLRequestContextGetter* DeviceOAuth2TokenService::GetRequestContext() {
   return url_request_context_getter_.get();
 }
 
 scoped_ptr<OAuth2TokenService::RequestImpl>
 DeviceOAuth2TokenService::CreateRequest(
+    const std::string& account_id,
     OAuth2TokenService::Consumer* consumer) {
   if (refresh_token_is_valid_)
-    return OAuth2TokenService::CreateRequest(consumer);
+    return OAuth2TokenService::CreateRequest(account_id, consumer);
 
   // Substitute our own consumer to wait for refresh token validation.
   scoped_ptr<ValidatingConsumer> validating_consumer(
-      new ValidatingConsumer(this, consumer));
+      new ValidatingConsumer(this, account_id, consumer));
   validating_consumer->StartValidation();
   return validating_consumer.PassAs<RequestImpl>();
 }
 
 }  // namespace chromeos