Revert of Add account_type into AccountId

chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc

 // Copyright 2015 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/easy_unlock/bootstrap_manager.h"
 
 #include <stddef.h>
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
-#include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/known_user.h"
 
 namespace chromeos {
 
 namespace {
 
 // A pref list of users who have not finished Easy bootstrapping.
 const char kPendingEasyBootstrapUsers[] = "PendingEasyBootstrapUsers";
 
 }  // namespace
@@ skipping 35 matching lines @@
 void BootstrapManager::RemoveAllPendingBootstrap() {
   PrefService* local_state = g_browser_process->local_state();
 
   const base::ListValue* users =
       local_state->GetList(kPendingEasyBootstrapUsers);
   for (size_t i = 0; i < users->GetSize(); ++i) {
     std::string current_user_email;
     if (users->GetString(i, &current_user_email)) {
       delegate_->RemovePendingBootstrapUser(
           user_manager::known_user::GetAccountId(current_user_email,
-                                                 std::string() /* id */,
-                                                 AccountType::UNKNOWN));
+                                                 std::string() /* gaia_id */));
     }
   }
 
   local_state->ClearPref(kPendingEasyBootstrapUsers);
   local_state->CommitPendingWrite();
 }
 
 bool BootstrapManager::HasPendingBootstrap(const AccountId& account_id) const {
   PrefService* local_state = g_browser_process->local_state();
 
   const base::ListValue* users =
       local_state->GetList(kPendingEasyBootstrapUsers);
   for (size_t i = 0; i < users->GetSize(); ++i) {
     std::string current_user;
     if (users->GetString(i, &current_user) &&
         account_id.GetUserEmail() == current_user)
       return true;
   }
   return false;
 }
 
 }  // namespace chromeos