Make OAuth2TokenService::Request class multi-login aware.

chrome/browser/signin/profile_oauth2_token_service_request.cc

 // Copyright 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.
 
 #include "chrome/browser/signin/profile_oauth2_token_service_request.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 15 matching lines @@
        ProfileOAuth2TokenServiceRequest* owner);
   // Starts fetching an OAuth2 access token for |account_id| and |scopes|. It
   // should be called on the owner thread.
   void Start(
       const std::string& account_id,
       const OAuth2TokenService::ScopeSet& scopes);
   // Stops the OAuth2 access token fetching. It should be called on the owner
   // thread.
   void Stop();
 
+  OAuth2TokenService::Request* request();
+
   // OAuth2TokenService::Consumer. It should be called on the UI thread.
   virtual void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                                  const std::string& access_token,
                                  const base::Time& expiration_time) OVERRIDE;
   virtual void OnGetTokenFailure(const OAuth2TokenService::Request* request,
                                  const GoogleServiceAuthError& error) OVERRIDE;
 
  private:
   friend class
       base::RefCountedThreadSafe<ProfileOAuth2TokenServiceRequest::Core>;
@@ skipping 71 matching lines @@
     StopOnUIThread();
   } else {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&ProfileOAuth2TokenServiceRequest::Core::StopOnUIThread,
                    this));
   }
 }
 
+OAuth2TokenService::Request* ProfileOAuth2TokenServiceRequest::Core::request() {
+  return request_.get();
+}
+
 void ProfileOAuth2TokenServiceRequest::Core::StopOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   request_.reset();
 }
 
 void ProfileOAuth2TokenServiceRequest::Core::StartOnUIThread(
     const std::string& account_id,
     const OAuth2TokenService::ScopeSet& scopes) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ skipping 67 matching lines @@
     OAuth2TokenService::Consumer* consumer)
     : consumer_(consumer),
       core_(new Core(profile, this)) {
   core_->Start(account_id, scopes);
 }
 
 ProfileOAuth2TokenServiceRequest::~ProfileOAuth2TokenServiceRequest() {
   DCHECK(CalledOnValidThread());
   core_->Stop();
 }
+
+std::string ProfileOAuth2TokenServiceRequest::GetAccountId() const {
+  return core_->request()->GetAccountId();
+}
+