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

chrome/browser/sync_file_system/drive_backend_v1/api_util.cc

 // Copyright 2013 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/sync_file_system/drive_backend_v1/api_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <sstream>
 #include <string>
@@ skipping 150 matching lines @@
     : wapi_url_generator_(
           GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
           GURL(google_apis::GDataWapiUrlGenerator::
                kBaseDownloadUrlForProduction)),
       drive_api_url_generator_(
           GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
           GURL(google_apis::DriveApiUrlGenerator::
                kBaseDownloadUrlForProduction)),
       upload_next_key_(0),
       temp_dir_path_(temp_dir_path) {
-  OAuth2TokenService* oauth_service =
+  ProfileOAuth2TokenService* oauth_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
   if (IsDriveAPIDisabled()) {
     drive_service_.reset(new drive::GDataWapiService(
         oauth_service,
+        oauth_service->GetPrimaryAccountId(),
         profile->GetRequestContext(),
         content::BrowserThread::GetBlockingPool(),
         GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
         GURL(google_apis::GDataWapiUrlGenerator::kBaseDownloadUrlForProduction),
         std::string() /* custom_user_agent */));
   } else {
     drive_service_.reset(new drive::DriveAPIService(
         oauth_service,
+        oauth_service->GetPrimaryAccountId(),
         profile->GetRequestContext(),
         content::BrowserThread::GetBlockingPool(),
         GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
         GURL(google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction),
         GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
         std::string() /* custom_user_agent */));
   }
 
   drive_service_->Initialize();
   drive_service_->AddObserver(this);
@@ skipping 944 matching lines @@
 }
 
 std::string APIUtil::GetRootResourceId() const {
   if (IsDriveAPIDisabled())
     return drive_service_->GetRootResourceId();
   return root_resource_id_;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system