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

chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc

Index: chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc
index ba98790095c0ad32e944a9074bdc9b00be2b1773..889e8457a9ddf65aed73a3badad1f2c16bcbf81d 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.cc
@@ -79,7 +79,8 @@ void UserCloudPolicyTokenForwarder::Initialize() {
     return;
   }
 
-  if (token_service_->RefreshTokenIsAvailable())
+  if (token_service_->RefreshTokenIsAvailable(
+          token_service_->GetPrimaryAccountId()))
     RequestAccessToken();
   else
     token_service_->AddObserver(this);
@@ -88,7 +89,8 @@ void UserCloudPolicyTokenForwarder::Initialize() {
 void UserCloudPolicyTokenForwarder::RequestAccessToken() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
-  request_ = token_service_->StartRequest(scopes, this);
+  request_ = token_service_->StartRequest(token_service_->GetPrimaryAccountId(),

[Andrew T Wilson (Slow), 2013/08/30 10:47:00]

I think the wrapping is wrong here - either you should wrap the first param to
the next line, or align all params with the open paren.

[fgorski, 2013/08/30 20:10:16]

Done.

+      scopes, this);
 }
 
 }  // namespace policy