Add account_type into AccountId

components/user_manager/user_manager_base.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 "components/user_manager/user_manager_base.h"
 
 #include <stddef.h>
 #include <set>
 #include <utility>
 
@@ skipping 472 matching lines @@
                                     std::set<AccountId>* users_set) {
   users_vector->clear();
   users_set->clear();
   for (size_t i = 0; i < users_list.GetSize(); ++i) {
     std::string email;
     if (!users_list.GetString(i, &email) || email.empty()) {
       LOG(ERROR) << "Corrupt entry in user list at index " << i << ".";
       continue;
     }
 
-    const AccountId account_id = known_user::GetAccountId(email, std::string());
+    const AccountId account_id = known_user::GetAccountId(
+        email, std::string() /* gaia_id */, AccountType::UNKNOWN);

[Roger Tawa OOO till Jul 10th, 2016/12/05 16:34:32]

It's unclear to me why the type is unknown.  If this is for legacy support,
shouldn't the type be google?

If you keep a two-arg overload of GetAccountId() that internally calls the
three-arg overload with AccountType::UNKNOWN, I think you could reduce the size
of this CL by half.

[Alexander Alekseev, 2016/12/06 02:21:14]

"Known_user::GetAccountId()" is a bit tricky. This is to convert different
"local" account ids to real AccountId. For example, if we receive user e-mail
from Extension, we know only e-mail, but not account type or gaia id.

So the idea is to supply "All the information we know about the user" to this
method and it will resolve to real AccountId.

This is actually temporary method for the most of chrome code (until full
migration is done), and then we can look at what we need for the "external" API
left.

So I'd have all known user data as call parameters here.

 
     if (existing_users.find(account_id) != existing_users.end() ||
         !users_set->insert(account_id).second) {
       LOG(ERROR) << "Duplicate user: " << email;
       continue;
     }
     users_vector->push_back(account_id);
   }
 }
 
@@ skipping 557 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = nullptr;
 }
 
 }  // namespace user_manager