This CL replaces e-mail with AccountId in easy signin code.

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"
@@ skipping 38 matching lines @@
   }
   base::FilePath token_file = base_path.Append(kSupervisedUserTokenFilename);
   int bytes = base::WriteFile(token_file, token.c_str(), token.length());
   return bytes >= 0;
 }
 
 }  // namespace
 
 SupervisedUserCreationControllerNew::SupervisedUserCreationControllerNew(
     SupervisedUserCreationControllerNew::StatusConsumer* consumer,
-    const std::string& manager_id)
+    const AccountId& manager_id)
     : SupervisedUserCreationController(consumer),
       stage_(STAGE_INITIAL),
       weak_factory_(this) {
   creation_context_.reset(
       new SupervisedUserCreationControllerNew::UserCreationContext());
   creation_context_->manager_id = manager_id;
 }
 
 SupervisedUserCreationControllerNew::~SupervisedUserCreationControllerNew() {}
 
@@ skipping 86 matching lines @@
   creation_context_->local_user_id = manager->GenerateUserId();
   if (creation_context_->creation_type == NEW_USER) {
     creation_context_->sync_user_id =
         SupervisedUserRegistrationUtility::GenerateNewSupervisedUserId();
   }
 
   manager->SetCreationTransactionUserId(creation_context_->local_user_id);
 
   stage_ = TRANSACTION_STARTED;
 
-  manager->CreateUserRecord(creation_context_->manager_id,
+  manager->CreateUserRecord(creation_context_->manager_id.GetUserEmail(),
                             creation_context_->local_user_id,
                             creation_context_->sync_user_id,
                             creation_context_->display_name);
 
   SupervisedUserAuthentication* authentication =
       ChromeUserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
 
   // When importing M35+ users we need only to store data, for all other cases
   // we need to create some keys.
   if (creation_context_->creation_type != USER_IMPORT_NEW) {
@@ skipping 238 matching lines @@
   creation_context_->registration_utility.reset();
   chrome::AttemptUserExit();
 }
 
 std::string SupervisedUserCreationControllerNew::GetSupervisedUserId() {
   DCHECK(creation_context_);
   return creation_context_->local_user_id;
 }
 
 }  // namespace chromeos