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

chrome/browser/sync_file_system/sync_file_system_service_factory.cc

 // Copyright (c) 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/sync_file_system_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/drive/drive_api_service.h"
 #include "chrome/browser/drive/drive_notification_manager_factory.h"
@@ skipping 62 matching lines @@
       kEnableSyncFileSystemV2)) {
     RegisterSyncableFileSystem();
 
     GURL base_drive_url(
         google_apis::DriveApiUrlGenerator::kBaseUrlForProduction);
     GURL base_download_url(
         google_apis::DriveApiUrlGenerator::kBaseDownloadUrlForProduction);
     GURL wapi_base_url(
         google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction);
 
+    ProfileOAuth2TokenService* token_service =
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
+
     scoped_ptr<drive::DriveAPIService> drive_api_service(
         new drive::DriveAPIService(
-            ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
+            token_service,
+            token_service->GetPrimaryAccountId(),
             context->GetRequestContext(),
             content::BrowserThread::GetBlockingPool(),
             base_drive_url, base_download_url, wapi_base_url,
             std::string() /* custom_user_agent */));
 
     drive::DriveNotificationManager* notification_manager =
         drive::DriveNotificationManagerFactory::GetForBrowserContext(profile);
     ExtensionService* extension_service =
         extensions::ExtensionSystem::Get(profile)->extension_service();
 
@@ skipping 18 matching lines @@
     remote_file_service->SetConflictResolutionPolicy(
         CONFLICT_RESOLUTION_POLICY_MANUAL);
   }
 
   service->Initialize(local_file_service.Pass(),
                       remote_file_service.Pass());
   return service;
 }
 
 }  // namespace sync_file_system