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 26 matching lines @@
 
 enum ParentType {
   PARENT_TYPE_ROOT_OR_EMPTY,
   PARENT_TYPE_DIRECTORY,
 };
 
 const char kSyncRootDirectoryName[] = "Chrome Syncable FileSystem";
 const char kSyncRootDirectoryNameDev[] = "Chrome Syncable FileSystem Dev";
 const char kMimeTypeOctetStream[] = "application/octet-stream";
 
+const char kFakeAccountId[] = "test_user@gmail.com";
 const char kFakeServerBaseUrl[] = "https://fake_server/";
 const char kFakeDownloadServerBaseUrl[] = "https://fake_download_server/";
 
 void EmptyGDataErrorCodeCallback(google_apis::GDataErrorCode error) {}
 
 bool HasParentLinkTo(const ScopedVector<google_apis::Link>& links,
                      const std::string& parent_resource_id,
                      ParentType parent_type) {
   bool has_parent = false;
 
@@ skipping 104 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,
         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,
         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_->Initialize(oauth_service->GetPrimaryAccountId());
   drive_service_->AddObserver(this);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
 
   drive_uploader_.reset(new drive::DriveUploader(
       drive_service_.get(), content::BrowserThread::GetBlockingPool()));
 }
 
 scoped_ptr<APIUtil> APIUtil::CreateForTesting(
     const base::FilePath& temp_dir_path,
     scoped_ptr<drive::DriveServiceInterface> drive_service,
     scoped_ptr<drive::DriveUploaderInterface> drive_uploader) {
   return make_scoped_ptr(new APIUtil(
       temp_dir_path,
       GURL(kFakeServerBaseUrl),
       GURL(kFakeDownloadServerBaseUrl),
       drive_service.Pass(),
-      drive_uploader.Pass()));
+      drive_uploader.Pass(),
+      kFakeAccountId));
 }
 
 APIUtil::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)
     : wapi_url_generator_(base_url, base_download_url),
       drive_api_url_generator_(base_url, base_download_url),
       upload_next_key_(0),
       temp_dir_path_(temp_dir_path) {
   drive_service_ = drive_service.Pass();
-  drive_service_->Initialize();
+  drive_service_->Initialize(account_id);
   drive_service_->AddObserver(this);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
 
   drive_uploader_ = drive_uploader.Pass();
 }
 
 APIUtil::~APIUtil() {
   DCHECK(CalledOnValidThread());
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   drive_service_->RemoveObserver(this);
@@ skipping 905 matching lines @@
 }
 
 std::string APIUtil::GetRootResourceId() const {
   if (IsDriveAPIDisabled())
     return drive_service_->GetRootResourceId();
   return root_resource_id_;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system