Revert of Add account_type into AccountId

chrome/browser/chromeos/login/supervised/supervised_user_authenticator.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_authenticator.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
@@ skipping 52 matching lines @@
            scoped_refptr<SupervisedUserAuthenticator> resolver,
            int flags,
            const std::string& system_salt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker(
       "CryptohomeMount-LMU-Start", false);
 
   Key key(attempt->password);
   key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
   const AccountId account_id = user_manager::known_user::GetAccountId(
-      attempt->username, std::string() /* id */, AccountType::UNKNOWN);
+      attempt->username, std::string() /* gaia_id */);
   const cryptohome::Identification cryptohome_id(account_id);
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncMount(
       cryptohome_id, key.GetSecret(), flags,
       base::Bind(&TriggerResolveWithLoginTimeMarker, "CryptohomeMount-LMU-End",
                  attempt, resolver));
 
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncGetSanitizedUsername(
       cryptohome_id, base::Bind(&TriggerResolveResult, attempt, resolver));
 }
 
 // Calls cryptohome's addKey method.
 void AddKey(SupervisedUserAuthenticator::AuthAttempt* attempt,
             scoped_refptr<SupervisedUserAuthenticator> resolver,
             const std::string& plain_text_master_key,
             const std::string& system_salt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   chromeos::BootTimesRecorder::Get()->AddLoginTimeMarker(
       "CryptohomeAddKey-LMU-Start", false);
 
   Key user_key(attempt->password);
   user_key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
   Key master_key(plain_text_master_key);
   master_key.Transform(Key::KEY_TYPE_SALTED_SHA256_TOP_HALF, system_salt);
   const AccountId account_id = user_manager::known_user::GetAccountId(
-      attempt->username, std::string() /* id */, AccountType::UNKNOWN);
+      attempt->username, std::string() /* gaia_id */);
   cryptohome::AsyncMethodCaller::GetInstance()->AsyncAddKey(
       cryptohome::Identification(account_id), user_key.GetSecret(),
       master_key.GetSecret(),
       base::Bind(&TriggerResolveWithLoginTimeMarker, "CryptohomeAddKey-LMU-End",
                  attempt, resolver));
 }
 
 }  // namespace
 
 SupervisedUserAuthenticator::SupervisedUserAuthenticator(
@@ skipping 227 matching lines @@
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return hash_obtained_;
 }
 
 std::string SupervisedUserAuthenticator::AuthAttempt::hash() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return hash_;
 }
 
 }  // namespace chromeos