User cloud policy token forwarder: Replace PO2TS::GetPrimaryAccountId() with SMB::GetAuthenticatedAc

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/signin/profile_oauth2_token_service.h"
+#include "chrome/browser/signin/signin_manager.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 
 namespace policy {
 
 UserCloudPolicyTokenForwarder::UserCloudPolicyTokenForwarder(
     UserCloudPolicyManagerChromeOS* manager,
-    ProfileOAuth2TokenService* token_service)
+    ProfileOAuth2TokenService* token_service,
+    SigninManagerBase* signin_manager)
     : OAuth2TokenService::Consumer("policy_token_forwarder"),
       manager_(manager),
-      token_service_(token_service) {
+      token_service_(token_service),
+      signin_manager_(signin_manager) {
   // Start by waiting for the CloudPolicyService to be initialized, so that
   // we can check if it already has a DMToken or not.
   if (manager_->core()->service()->IsInitializationComplete()) {
     Initialize();
   } else {
     manager_->core()->service()->AddObserver(this);
   }
 }
 
 UserCloudPolicyTokenForwarder::~UserCloudPolicyTokenForwarder() {}
@@ skipping 39 matching lines @@
     CloudPolicyService* service) {
   Initialize();
 }
 
 void UserCloudPolicyTokenForwarder::Initialize() {
   // TODO(mnissler): Once a better way to reconfirm whether a user is on the
   // login whitelist is available, there is no reason to fetch the OAuth2 token
   // here if the client is already registered, so check and bail out here.
 
   if (token_service_->RefreshTokenIsAvailable(
-          token_service_->GetPrimaryAccountId()))
+          signin_manager_->GetAuthenticatedAccountId()))
     RequestAccessToken();
   else
     token_service_->AddObserver(this);
 }
 
 void UserCloudPolicyTokenForwarder::RequestAccessToken() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
   scopes.insert(GaiaUrls::GetInstance()->oauth_wrap_bridge_user_info_scope());
   request_ = token_service_->StartRequest(
-      token_service_->GetPrimaryAccountId(), scopes, this);
+      signin_manager_->GetAuthenticatedAccountId(), scopes, this);
 }
 
 }  // namespace policy