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

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
index d7d26a10914d8b086727ee81eb83cf01aade9f65..d22d492a27c1ecb0fc7b91ef608e5bffe1cd4b97 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
@@ -151,7 +151,8 @@ void StartupAppLauncher::InitializeTokenService() {
 
   ProfileOAuth2TokenService* profile_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-  if (profile_token_service->RefreshTokenIsAvailable()) {
+  if (profile_token_service->RefreshTokenIsAvailable(
+          profile_token_service->GetPrimaryAccountId())) {
     InitializeNetwork();
     return;
   }