Make sure GetAuthenticatedAccountId() returns a canonicalized id.

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 "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
@@ skipping 62 matching lines @@
 void UserCloudPolicyTokenForwarder::OnInitializationCompleted(
     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(
+  if (signin_manager_->IsAuthenticated() &&

[Joao da Silva, 2014/10/08 13:19:17]

This is ChromeOS code, so AFAICT this is always true. Am I missing something?

+      token_service_->RefreshTokenIsAvailable(
           signin_manager_->GetAuthenticatedAccountId()))
     RequestAccessToken();
   else
     token_service_->AddObserver(this);
 }
 
 void UserCloudPolicyTokenForwarder::RequestAccessToken() {
   OAuth2TokenService::ScopeSet scopes;
   scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
   scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
   request_ = token_service_->StartRequest(
       signin_manager_->GetAuthenticatedAccountId(), scopes, this);
 }
 
 }  // namespace policy