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

chrome/browser/ui/webui/options/chromeos/user_image_source.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/user_image_source.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_image/default_user_images.h"
 #include "components/user_manager/user_manager.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_chromeos_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/third_party/mozilla/url_parse.h"
 
 namespace {
 
 // Parses the user image URL, which looks like
 // "chrome://userimage/user@host?key1=value1&...&key_n=value_n",

[dzhioev (left Google), 2015/11/12 00:46:24]

Update the comment.

[Alexander Alekseev, 2015/11/12 06:53:04]

Done.

 // to user email.
 void ParseRequest(const GURL& url,
                   std::string* email) {
   DCHECK(url.is_valid());
-  *email = net::UnescapeURLComponent(url.path().substr(1),
-                                    (net::UnescapeRule::URL_SPECIAL_CHARS |
-                                     net::UnescapeRule::SPACES));
+  const std::string user_id = net::UnescapeURLComponent(

[stevenjb, 2015/11/11 20:39:23]

s/user_id/serialized_account_id/

[Alexander Alekseev, 2015/11/12 06:53:04]

Done.

+      url.path().substr(1),
+      (net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::SPACES));
+  AccountId account_id(EmptyAccountId());
+  const bool status = AccountId::Deserialize(user_id, &account_id);
+  // TODO(alemate): DCHECK(status) - should happen after options page is
+  // migrated.
+  if (!status) {
+    LOG(WARNING) << "Failed to deserialize '" << user_id << "'";

[dzhioev (left Google), 2015/11/12 00:46:24]

I believe we shouldn't produce this warning, as long as it perfectly legal for
options page to use the old format.
We can introduce an additional query param to distinguish email requests from
account_id requests, i.e.:

  * chrome://userimage/old_format_email@example.com for email requests,
  * chrome://userimage/<serialized_account_id>?format=account_id for account_id
requests.

[Alexander Alekseev, 2015/11/12 06:53:04]

I don't think we should support other ID formats for long. So this is going to
be removed after migration.

+    account_id = AccountId::FromUserEmail(user_id);
+  }
+  *email = account_id.GetUserEmail();
 }
 
 }  // namespace
 
 namespace chromeos {
 namespace options {
 
 // Static.
 base::RefCountedMemory* UserImageSource::GetUserImage(
     const AccountId& account_id,
@@ skipping 42 matching lines @@
 }
 
 std::string UserImageSource::GetMimeType(const std::string& path) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
 }  // namespace options
 }  // namespace chromeos