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 40 matching lines @@
   // requests issued through the service if the value is not empty.
   GDataWapiService(OAuth2TokenService* oauth2_token_service,
                    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 Initialize(const std::string& account_id) OVERRIDE;
   virtual void AddObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual void RemoveObserver(DriveServiceObserver* observer) OVERRIDE;
   virtual bool CanSendRequest() const OVERRIDE;
   virtual ResourceIdCanonicalizer GetResourceIdCanonicalizer() const OVERRIDE;
   virtual bool HasAccessToken() const OVERRIDE;
   virtual void RequestAccessToken(
       const google_apis::AuthStatusCallback& callback) OVERRIDE;
   virtual bool HasRefreshToken() const OVERRIDE;
   virtual void ClearAccessToken() OVERRIDE;
   virtual void ClearRefreshToken() OVERRIDE;
@@ skipping 124 matching lines @@
   // 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_