Reland of This CL replaces e-mail with AccountId on user selection screen.

components/user_manager/user_manager_base.h

 // 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.
 
 #ifndef COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 #define COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 136 matching lines @@
                           int reauth_reason) override;
   bool FindReauthReason(const AccountId& account_id, int* out_value) override;
 
   // This method updates "User was added to the device in this session nad is
   // not full initialized yet" flag.
   virtual void SetIsCurrentUserNew(bool is_new);
 
   // TODO(xiyuan): Figure out a better way to expose this info.
   virtual bool HasPendingBootstrap(const AccountId& account_id) const;
 
-  // Helper function that copies users from |users_list| to |users_vector| and
+  // Helper function that converts users from |users_list| to |users_vector| and
   // |users_set|. Duplicates and users already present in |existing_users| are
   // skipped.
-  static void ParseUserList(const base::ListValue& users_list,
-                            const std::set<AccountId>& existing_users,
-                            std::vector<AccountId>* users_vector,
-                            std::set<AccountId>* users_set);
+  void ParseUserList(const base::ListValue& users_list,
+                     const std::set<AccountId>& existing_users,
+                     std::vector<AccountId>* users_vector,
+                     std::set<AccountId>* users_set);
 
   // Returns true if trusted device policies have successfully been retrieved
   // and ephemeral users are enabled.
   virtual bool AreEphemeralUsersEnabled() const = 0;
 
  protected:
   // Adds |user| to users list, and adds it to front of LRU list. It is assumed
   // that there is no user with same id.
   virtual void AddUserRecord(User* user);
 
@@ skipping 258 matching lines @@
   scoped_refptr<base::TaskRunner> blocking_task_runner_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UserManagerBase);
 };
 
 }  // namespace user_manager
 
 #endif  // COMPONENTS_USER_MANAGER_USER_MANAGER_BASE_H_