Making OAuth2TokenService multi-login aware, updating callers, minor fixes

chrome/browser/drive/drive_api_service.h

Index: chrome/browser/drive/drive_api_service.h
diff --git a/chrome/browser/drive/drive_api_service.h b/chrome/browser/drive/drive_api_service.h
index b89611242c527362e493a48dee2ed03936a66805..b9990ab9184d04ae99c876e541c22e911c7c33d9 100644
--- a/chrome/browser/drive/drive_api_service.h
+++ b/chrome/browser/drive/drive_api_service.h
@@ -41,6 +41,7 @@ class DriveAPIService : public DriveServiceInterface,
                         public google_apis::AuthServiceObserver {
  public:
   // |oauth2_token_service| is used for obtaining OAuth2 access tokens.
+  // |account_id| identifies account used to obtain OAuth2 access tokens.
   // |url_request_context_getter| is used to initialize URLFetcher.
   // |blocking_task_runner| is used to run blocking tasks (like parsing JSON).
   // |base_url| is used to generate URLs for communication with the drive API.
@@ -53,6 +54,7 @@ class DriveAPIService : public DriveServiceInterface,
   // requests issues through the service if the value is not empty.
   DriveAPIService(
       OAuth2TokenService* oauth2_token_service,
+      const std::string& account_id,
       net::URLRequestContextGetter* url_request_context_getter,
       base::TaskRunner* blocking_task_runner,
       const GURL& base_url,
@@ -184,6 +186,7 @@ class DriveAPIService : public DriveServiceInterface,
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
   OAuth2TokenService* oauth2_token_service_;
+  std::string account_id_;
   net::URLRequestContextGetter* url_request_context_getter_;
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
   scoped_ptr<google_apis::RequestSender> sender_;