Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/policy/cloud/user_policy_signin_service.cc

 // Copyright (c) 2012 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/policy/cloud/user_policy_signin_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 24 matching lines @@
                                   local_state,
                                   device_management_service,
                                   policy_manager,
                                   signin_manager,
                                   system_request_context),
       profile_(profile),
       oauth2_token_service_(token_service) {
   // ProfileOAuth2TokenService should not yet have loaded its tokens since this
   // happens in the background after PKS initialization - so this service
   // should always be created before the oauth token is available.
-  DCHECK(!oauth2_token_service_->RefreshTokenIsAvailable(
-             signin_manager->GetAuthenticatedAccountId()));
+  DCHECK(!signin_manager->IsAuthenticated() ||
+         (!oauth2_token_service_->RefreshTokenIsAvailable(
+              signin_manager->GetAuthenticatedAccountId())));
 
   // Listen for an OAuth token to become available so we can register a client
   // if for some reason the client is not already registered (for example, if
   // the policy load failed during initial signin).
   oauth2_token_service_->AddObserver(this);
 }
 
 UserPolicySigninService::~UserPolicySigninService() {
 }
 
@@ skipping 132 matching lines @@
 }
 
 void UserPolicySigninService::ProhibitSignoutIfNeeded() {
   if (policy_manager()->IsClientRegistered()) {
     DVLOG(1) << "User is registered for policy - prohibiting signout";
     signin_manager()->ProhibitSignout(true);
   }
 }
 
 }  // namespace policy