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

components/login/base_screen_handler_utils.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/login/base_screen_handler_utils.h"
 
+#include "components/signin/core/account_id/account_id.h"
+
 namespace login {
 
 namespace {
 
 template <typename StringListType>
 bool ParseStringList(const base::Value* value, StringListType* out_value) {
   const base::ListValue* list = NULL;
   if (!value->GetAsList(&list))
     return false;
   out_value->resize(list->GetSize());
@@ skipping 32 matching lines @@
 }
 
 bool ParseValue(const base::Value* value, StringList* out_value) {
   return ParseStringList(value, out_value);
 }
 
 bool ParseValue(const base::Value* value, String16List* out_value) {
   return ParseStringList(value, out_value);
 }
 
+bool ParseValue(const base::Value* value, AccountId* out_value) {
+  std::string serialized;
+  const bool has_string = value->GetAsString(&serialized);
+  if (!has_string)
+    return false;
+
+  if (AccountId::Deserialize(serialized, out_value))
+    return true;
+
+  LOG(ERROR) << "Failed to deserialize '" << serialized << "'";
+  *out_value = AccountId::FromUserEmail(serialized);
+  return true;
+}
+
 base::FundamentalValue MakeValue(bool v) {
   return base::FundamentalValue(v);
 }
 
 base::FundamentalValue MakeValue(int v) {
   return base::FundamentalValue(v);
 }
 
 base::FundamentalValue MakeValue(double v) {
   return base::FundamentalValue(v);
 }
 
 base::StringValue MakeValue(const std::string& v) {
   return base::StringValue(v);
 }
 
 base::StringValue MakeValue(const base::string16& v) {
   return base::StringValue(v);
 }
 
+base::StringValue MakeValue(const AccountId& v) {
+  return base::StringValue(v.Serialize());
+}
+
+ParsedValueContainer<AccountId>::ParsedValueContainer() {
+}
+
 }  // namespace login