Canonicalize enterprise registration user.

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.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/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#include "chrome/browser/chromeos/login/authenticator.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/policy/auto_enrollment_client.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_metrics.h"
 
 namespace chromeos {
 
 namespace {
 
@@ skipping 21 matching lines @@
       !cryptohome->TpmIsOwned()) {
     cryptohome->TpmCanAttemptOwnership();
   }
 }
 
 EnterpriseEnrollmentScreen::~EnterpriseEnrollmentScreen() {}
 
 void EnterpriseEnrollmentScreen::SetParameters(bool is_auto_enrollment,
                                                const std::string& user) {
   is_auto_enrollment_ = is_auto_enrollment;
-  user_ = user;
+  user_ = user.empty() ? user : Authenticator::Canonicalize(user);
 }
 
 void EnterpriseEnrollmentScreen::PrepareToShow() {
   actor_->PrepareToShow();
 }
 
 void EnterpriseEnrollmentScreen::Show() {
   is_showing_ = true;
   actor_->Show();
 }
 
 void EnterpriseEnrollmentScreen::Hide() {
   is_showing_ = false;
   actor_->Hide();
 }
 
 void EnterpriseEnrollmentScreen::OnOAuthTokenAvailable(
     const std::string& user,
     const std::string& token) {
-  user_ = user;
+  user_ = Authenticator::Canonicalize(user);
   RegisterForDevicePolicy(token);
 }
 
 void EnterpriseEnrollmentScreen::OnConfirmationClosed(bool go_back_to_signin) {
   get_screen_observer()->OnExit(go_back_to_signin ?
       ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED :
       ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
 }
 
 bool EnterpriseEnrollmentScreen::IsAutoEnrollment(std::string* user) {
@@ skipping 128 matching lines @@
     // and notify us of progress through CloudPolicySubsystem::Observer.
     connector->RegisterForDevicePolicy(user_, token, is_auto_enrollment_);
     return;
   }
   NOTREACHED();
   if (is_showing_)
     actor_->ShowFatalEnrollmentError();
 }
 
 }  // namespace chromeos