Make sure GetAuthenticatedAccountId() returns a canonicalized id.

chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc

 // Copyright 2014 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_mobile.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 175 matching lines @@
 
 void UserPolicySigninService::ShutdownUserCloudPolicyManager() {
   CancelPendingRegistration();
   UserPolicySigninServiceBase::ShutdownUserCloudPolicyManager();
 }
 
 void UserPolicySigninService::RegisterCloudPolicyService() {
   // If the user signed-out while this task was waiting then Shutdown() would
   // have been called, which would have invalidated this task. Since we're here
   // then the user must still be signed-in.
-  const std::string& username = signin_manager()->GetAuthenticatedUsername();
-  DCHECK(!username.empty());
+  DCHECK(signin_manager()->IsAuthenticated());
   DCHECK(!policy_manager()->IsClientRegistered());
   DCHECK(policy_manager()->core()->client());
 
   // Persist the current time as the last policy registration attempt time.
   profile_prefs_->SetInt64(prefs::kLastPolicyCheckTime,
                            base::Time::Now().ToInternalValue());
 
   registration_helper_.reset(new CloudPolicyClientRegistrationHelper(
       policy_manager()->core()->client(),
       GetRegistrationType()));
   registration_helper_->StartRegistration(
       oauth2_token_service_,
-      username,
+      signin_manager()->GetAuthenticatedUsername(),
       base::Bind(&UserPolicySigninService::OnRegistrationDone,
                  base::Unretained(this)));
 }
 
 void UserPolicySigninService::CancelPendingRegistration() {
   weak_factory_.InvalidateWeakPtrs();
 }
 
 void UserPolicySigninService::OnRegistrationDone() {
   registration_helper_.reset();
 }
 
 }  // namespace policy