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

chrome/browser/drive/gdata_wapi_service.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_
 #define CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 25 matching lines @@
 namespace drive {
 
 // This class provides documents feed service calls for WAPI (codename for
 // DocumentsList API).
 // Details of API call are abstracted in each request class and this class
 // works as a thin wrapper for the API.
 class GDataWapiService : 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 communicating with the WAPI
   // |base_download_url| is used to generate URLs for downloading file with WAPI
   // |custom_user_agent| is used for the User-Agent header in HTTP
   // requests issued through the service if the value is not empty.
   GDataWapiService(OAuth2TokenService* oauth2_token_service,
+                   const std::string& account_id,
                    net::URLRequestContextGetter* url_request_context_getter,
                    base::TaskRunner* blocking_task_runner,
                    const GURL& base_url,
                    const GURL& base_download_url,
                    const std::string& custom_user_agent);
   virtual ~GDataWapiService();
 
   // DriveServiceInterface Overrides
   virtual void Initialize() OVERRIDE;
   virtual void AddObserver(DriveServiceObserver* observer) OVERRIDE;
@@ skipping 116 matching lines @@
   virtual google_apis::CancelCallback AuthorizeApp(
       const std::string& resource_id,
       const std::string& app_id,
       const google_apis::AuthorizeAppCallback& callback) OVERRIDE;
 
  private:
   // AuthService::Observer override.
   virtual void OnOAuth2RefreshTokenChanged() OVERRIDE;
 
   OAuth2TokenService* oauth2_token_service_;  // Not owned.
+  std::string account_id_;
   net::URLRequestContextGetter* url_request_context_getter_;  // Not owned.
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
   scoped_ptr<google_apis::RequestSender> sender_;
   ObserverList<DriveServiceObserver> observers_;
   // Request objects should hold a copy of this, rather than a const
   // reference, as they may outlive this object.
   const google_apis::GDataWapiUrlGenerator url_generator_;
   const std::string custom_user_agent_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataWapiService);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_DRIVE_GDATA_WAPI_SERVICE_H_