summaryrefslogtreecommitdiffstats
path: root/ash/test
diff options
context:
space:
mode:
authoralemate <alemate@chromium.org>2015-11-18 02:46:19 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-18 10:47:09 +0000
commit1e24fe57a4ca921355bb1506f5a79627647a8c16 (patch)
tree3b0c77c133379b2bd54a4a42a21f777c92a32015 /ash/test
parenta370ef52788ea0f6c410b05ec40a74ee9bf3a647 (diff)
downloadchromium_src-1e24fe57a4ca921355bb1506f5a79627647a8c16.zip
chromium_src-1e24fe57a4ca921355bb1506f5a79627647a8c16.tar.gz
chromium_src-1e24fe57a4ca921355bb1506f5a79627647a8c16.tar.bz2
This CL replaces e-mail with AccountId on user selection screen.
This CL replaces e-mail with serialized AccountId on user selection screen. It also adds simple AccountId Serialize/Deserialize methods suitable for passing AccountId to JS code. This is part of transition to AccountId. BUG=462823, 552034 TEST=manual Review URL: https://codereview.chromium.org/1440583002 Cr-Commit-Position: refs/heads/master@{#360319}
Diffstat (limited to 'ash/test')
-rw-r--r--ash/test/test_session_state_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/test/test_session_state_delegate.cc b/ash/test/test_session_state_delegate.cc
index d7e8fbb..afab25d 100644
--- a/ash/test/test_session_state_delegate.cc
+++ b/ash/test/test_session_state_delegate.cc
@@ -56,7 +56,7 @@ class MockUserInfo : public user_manager::UserInfo {
std::string GetEmail() const override { return display_email_; }
- AccountId GetAccountId() const override { return account_id_; }
+ const AccountId& GetAccountId() const override { return account_id_; }
const gfx::ImageSkia& GetImage() const override { return user_image_; }