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

chrome/browser/sync_file_system/drive_backend_v1/api_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_API_UTIL_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_API_UTIL_H_
 
 #include <map>
 #include <string>
 
@@ skipping 100 matching lines @@
   typedef int64 UploadKey;
   typedef std::map<UploadKey, UploadFileCallback> UploadCallbackMap;
 
   friend class APIUtilTest;
 
   // Constructor for test use.
   APIUtil(const base::FilePath& temp_dir_path,
           const GURL& base_url,
           const GURL& base_download_url,
           scoped_ptr<drive::DriveServiceInterface> drive_service,
-          scoped_ptr<drive::DriveUploaderInterface> drive_uploader);
+          scoped_ptr<drive::DriveUploaderInterface> drive_uploader,
+          const std::string& account_id);
 
   void GetDriveRootResourceId(const GDataErrorCallback& callback);
   void DidGetDriveRootResourceId(
       const GDataErrorCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
   void DidGetDriveRootResourceIdForGetSyncRoot(
       const ResourceIdCallback& callback,
       google_apis::GDataErrorCode error);
@@ skipping 125 matching lines @@
 
   ObserverList<APIUtilObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(APIUtil);
 };
 
 }  // namespace drive_backend
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_API_UTIL_H_