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

chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder.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/chromeos/policy/user_cloud_policy_token_forwarder.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/policy/cloud/cloud_policy_core.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
@@ skipping 61 matching lines @@
 }
 
 void UserCloudPolicyTokenForwarder::Initialize() {
   if (manager_->IsClientRegistered()) {
     // We already have a DMToken, so no need to ask for an access token.
     // All done here.
     Shutdown();
     return;
   }
 
-  if (token_service_->RefreshTokenIsAvailable())
+  if (token_service_->RefreshTokenIsAvailable(
+          token_service_->GetPrimaryAccountId()))
     RequestAccessToken();
   else
     token_service_->AddObserver(this);
 }
 
 void UserCloudPolicyTokenForwarder::RequestAccessToken() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
-  request_ = token_service_->StartRequest(scopes, this);
+  request_ = token_service_->StartRequest(
+      token_service_->GetPrimaryAccountId(), scopes, this);
 }
 
 }  // namespace policy