This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/supervised/supervised_user_creation_controller_new.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/chromeos/login/supervised/supervised_user_creation_controller_new.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_constants.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
+#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "crypto/random.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace chromeos {
 
 namespace {
@@ skipping 240 matching lines @@
   base::Base64Decode(creation_context_->signature_key, &signature_key);
   password_key.authorization_data.push_back(
       cryptohome::KeyDefinition::AuthorizationData(false /* encrypt */,
                                                    true /* sign */,
                                                    signature_key));
 
   Key key(Key::KEY_TYPE_SALTED_PBKDF2_AES256_1234,
           std::string(),  // The salt is stored elsewhere.
           creation_context_->salted_master_key);
   key.SetLabel(kCryptohomeMasterKeyLabel);
-  UserContext context(creation_context_->local_user_id);
+  UserContext context(
+      AccountId::FromUserEmail(creation_context_->local_user_id));
   context.SetKey(key);
   context.SetIsUsingOAuth(false);
 
   authenticator_->AddKey(
       context,
       password_key,
       true,
       base::Bind(&SupervisedUserCreationControllerNew::OnAddKeySuccess,
                  weak_factory_.GetWeakPtr()));
 }
@@ skipping 73 matching lines @@
 
   if (!success) {
     stage_ = STAGE_ERROR;
     if (consumer_)
       consumer_->OnCreationError(TOKEN_WRITE_FAILED);
     return;
   }
   // Assume that new token is valid. It will be automatically invalidated if
   // sync service fails to use it.
   user_manager::UserManager::Get()->SaveUserOAuthStatus(
-      creation_context_->local_user_id,
+      AccountId::FromUserEmail(creation_context_->local_user_id),
       user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
   stage_ = TOKEN_WRITTEN;
 
   timeout_timer_.Stop();
   ChromeUserManager::Get()
       ->GetSupervisedUserManager()
       ->CommitCreationTransaction();
   content::RecordAction(
       base::UserMetricsAction("ManagedMode_LocallyManagedUserCreated"));
@@ skipping 18 matching lines @@
   creation_context_->registration_utility.reset();
   chrome::AttemptUserExit();
 }
 
 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() {
   DCHECK(creation_context_);
   return creation_context_->local_user_id;
 }
 
 }  // namespace chromeos