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

chrome/browser/drive/gdata_wapi_service.cc

 // 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.
 
 #include "chrome/browser/drive/gdata_wapi_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 109 matching lines @@
     app_list = AppList::CreateFromAccountMetadata(*account_metadata);
   }
 
   callback.Run(error, app_list.Pass());
 }
 
 }  // namespace
 
 GDataWapiService::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)
     : oauth2_token_service_(oauth2_token_service),
+      account_id_(account_id),
       url_request_context_getter_(url_request_context_getter),
       blocking_task_runner_(blocking_task_runner),
       url_generator_(base_url, base_download_url),
       custom_user_agent_(custom_user_agent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 GDataWapiService::~GDataWapiService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (sender_.get())
     sender_->auth_service()->RemoveObserver(this);
 }
 
 void GDataWapiService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   std::vector<std::string> scopes;
   scopes.push_back(util::kDocsListScope);
   scopes.push_back(kSpreadsheetsScope);
   scopes.push_back(kUserContentScope);
   // Drive App scope is required for even WAPI v3 apps access.
   scopes.push_back(util::kDriveAppsScope);
   sender_.reset(new RequestSender(
-      new AuthService(
-          oauth2_token_service_, url_request_context_getter_, scopes),
+      new 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);
 }
 
 void GDataWapiService::AddObserver(DriveServiceObserver* observer) {
   observers_.AddObserver(observer);
 }
@@ skipping 495 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive