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

chrome/browser/drive/drive_api_service.cc

Index: chrome/browser/drive/drive_api_service.cc
diff --git a/chrome/browser/drive/drive_api_service.cc b/chrome/browser/drive/drive_api_service.cc
index b19efabf225174188fe693abd7cc0d003e746ae9..75e283bfe0bf5e333177c55355d03bd35d14bffe 100644
--- a/chrome/browser/drive/drive_api_service.cc
+++ b/chrome/browser/drive/drive_api_service.cc
@@ -271,7 +271,7 @@ DriveAPIService::~DriveAPIService() {
     sender_->auth_service()->RemoveObserver(this);
 }
 
-void DriveAPIService::Initialize() {
+void DriveAPIService::Initialize(const std::string& account_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::vector<std::string> scopes;
@@ -283,11 +283,13 @@ void DriveAPIService::Initialize() {
   scopes.push_back(util::kDriveAppsScope);
 
   sender_.reset(new RequestSender(
-     new google_apis::AuthService(
-         oauth2_token_service_, url_request_context_getter_, scopes),
-     url_request_context_getter_,
-     blocking_task_runner_.get(),
-     custom_user_agent_));
+      new google_apis::AuthService(oauth2_token_service_,
+                                   account_id,
+                                   url_request_context_getter_,
+                                   scopes),
+      url_request_context_getter_,
+      blocking_task_runner_.get(),
+      custom_user_agent_));
   sender_->auth_service()->AddObserver(this);
 }