This CL replaces e-mail with AccountId in wallpaper manager code.

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 3e06d30888d212e09042b972728a4566a6ab21fd..c6b9f1ec01734d5a36151d0a4357f3c3ea4dd243 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -1016,7 +1016,8 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationSteps) {
   // new one is becoming visible, the background starts transitionining and the
   // shelf hides.
   StartUserTransitionAnimation(account_id_B);
-  EXPECT_EQ("->B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("->{\"email\":\"B\",\"gaia_id\":\"\"}",

[stevenjb, 2015/12/04 17:08:53]

Let's make this (and any other similar strings) a const.

[Alexander Alekseev, 2015/12/05 06:04:47]

Done.

+            GetWallpaperUserIdForTest());
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
@@ -1030,7 +1031,8 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationSteps) {
   // which should set the shelf to its users state. Since that isn't there we
   // can only make sure that it stays where it is.
   AdvanceUserTransitionAnimation();
-  EXPECT_EQ("->B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("->{\"email\":\"B\",\"gaia_id\":\"\"}",
+            GetWallpaperUserIdForTest());
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
@@ -1042,7 +1044,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationSteps) {
   // After the finalize the animation of the wallpaper should be finished.
   AdvanceUserTransitionAnimation();
   EXPECT_FALSE(shelf->IsShelfHiddenBehindBlackBar());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
 }
 
 // Test that the screen coverage is properly determined.
@@ -1088,21 +1090,21 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationStepsMaximizeToNormal) {
   // Start the animation and see that the new background is immediately set.
   StartUserTransitionAnimation(account_id_B);
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 
   // The next step will not change anything.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 
   // The final step will also not have any visible impact.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 }
@@ -1148,7 +1150,7 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationStepsNormalToMaximized) {
   // The final step however will switch the background.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 }
@@ -1181,42 +1183,42 @@ TEST_F(MultiUserWindowManagerChromeOSTest, AnimationStepsMaximizedToMaximized) {
   // the new user).
   StartUserTransitionAnimation(account_id_B);
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 
   // The next step will not change anything.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 
   // The final step however will hide the old window.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("H[A], S[B], H[C]", GetStatus());
-  EXPECT_EQ("B", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"B\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(0.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(1.0f, window(1)->layer()->GetTargetOpacity());
 
   // Switching back will do the exact same thing.
   StartUserTransitionAnimation(account_id_A);
   EXPECT_EQ("S[A], H[B], H[C]", GetStatus());
-  EXPECT_EQ("A", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"A\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(1.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(0.0f, window(1)->layer()->GetTargetOpacity());
 
   // The next step will not change anything.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("S[A], H[B], H[C]", GetStatus());
-  EXPECT_EQ("A", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"A\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(1.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(0.0f, window(1)->layer()->GetTargetOpacity());
 
   // The final step is also not changing anything to the status.
   AdvanceUserTransitionAnimation();
   EXPECT_EQ("S[A], H[B], H[C]", GetStatus());
-  EXPECT_EQ("A", GetWallpaperUserIdForTest());
+  EXPECT_EQ("{\"email\":\"A\",\"gaia_id\":\"\"}", GetWallpaperUserIdForTest());
   EXPECT_EQ(1.0f, window(0)->layer()->GetTargetOpacity());
   EXPECT_EQ(0.0f, window(1)->layer()->GetTargetOpacity());
 }