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

chrome/browser/chromeos/drive/drive_integration_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/chromeos/drive/drive_integration_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
@@ skipping 170 matching lines @@
       enabled_(false),
       cache_root_directory_(!test_cache_root.empty() ?
                             test_cache_root : util::GetCacheRootPath(profile)),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
   blocking_task_runner_ = blocking_pool->GetSequencedTaskRunner(
       blocking_pool->GetSequenceToken());
 
-  OAuth2TokenService* oauth_service =
+  ProfileOAuth2TokenService* oauth_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
 
   if (test_drive_service) {
     drive_service_.reset(test_drive_service);
   } else if (util::IsDriveV2ApiEnabled()) {
     drive_service_.reset(new DriveAPIService(
         oauth_service,
         g_browser_process->system_request_context(),
         blocking_task_runner_.get(),
         GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
@@ skipping 212 matching lines @@
       util::GetDriveMountPointPath().BaseName().AsUTF8Unsafe());
   util::Log(logging::LOG_INFO, "Drive mount point is removed");
 }
 
 void DriveIntegrationService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(NOT_INITIALIZED, state_);
   DCHECK(enabled_);
 
   state_ = INITIALIZING;
-  drive_service_->Initialize();
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&InitializeMetadata,
                  cache_root_directory_,
                  metadata_storage_.get(),
                  cache_.get(),
                  resource_metadata_.get(),
                  drive_service_->GetResourceIdCanonicalizer()),
       base::Bind(&DriveIntegrationService::InitializeAfterMetadataInitialized,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void DriveIntegrationService::InitializeAfterMetadataInitialized(
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(INITIALIZING, state_);
 
+  drive_service_->Initialize(
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
+          GetPrimaryAccountId());
+
   if (error != FILE_ERROR_OK) {
     LOG(WARNING) << "Failed to initialize: " << FileErrorToString(error);
 
     // Change the download directory to the default value if the download
     // destination is set to under Drive mount point.
     PrefService* pref_service = profile_->GetPrefs();
     if (util::IsUnderDriveMountPoint(
             pref_service->GetFilePath(prefs::kDownloadDefaultDirectory))) {
       pref_service->SetFilePath(prefs::kDownloadDefaultDirectory,
                                 DownloadPrefs::GetDefaultDownloadDirectory());
@@ skipping 106 matching lines @@
                                           NULL, base::FilePath(), NULL);
   } else {
     service = factory_for_test_.Run(profile);
   }
 
   service->SetEnabled(drive::util::IsDriveEnabledForProfile(profile));
   return service;
 }
 
 }  // namespace drive