cros: Pull user info from session_controller_client.mojom into separate mojom.

ash/system/user/tray_user_unittest.cc

 // Copyright 2013 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 <utility>
 #include <vector>
 
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
@@ skipping 239 matching lines @@
   gfx::Rect user_card_bounds = tray_user()->GetUserPanelBoundsInScreenForTest();
   gfx::Point second_user_point = user_card_bounds.CenterPoint() +
                                  gfx::Vector2d(0, user_card_bounds.height());
   generator.MoveMouseTo(second_user_point);
   generator.ClickLeftButton();
 
   // SwitchActiverUser is an async mojo call. Spin the loop to let it finish.
   RunAllPendingInMessageLoop();
 
   const mojom::UserSession* active_user = controller()->GetUserSession(0);
-  EXPECT_EQ(active_user->account_id, second_user->account_id);
+  EXPECT_EQ(active_user->user_info->account_id,
+            second_user->user_info->account_id);
   // Since the name is capitalized, the email should be different than the
   // user_id.
-  EXPECT_NE(active_user->account_id.GetUserEmail(), second_user->display_email);
+  EXPECT_NE(active_user->user_info->account_id.GetUserEmail(),
+            second_user->user_info->display_email);
   tray()->CloseSystemBubble();
 }
 
 // Test SessionController updates avatar image.
 TEST_F(TrayUserTest, AvatarChange) {
   InitializeParameters(1, false);
 
   // Expect empty avatar initially (that is how the test sets up).
   EXPECT_TRUE(tray_user()->avatar_view_for_test()->image_for_test().isNull());
 
   // Change user avatar via SessionController and verify.
   const gfx::ImageSkia red_icon =
       CreateImageSkiaWithColor(kTrayItemSize, kTrayItemSize, SK_ColorRED);
   mojom::UserSessionPtr user = controller()->GetUserSession(0)->Clone();
-  user->avatar = red_icon;
+  user->user_info->avatar = red_icon;
   controller()->UpdateUserSession(std::move(user));
   EXPECT_TRUE(gfx::test::AreImagesEqual(
       gfx::Image(red_icon),
       gfx::Image(tray_user()->avatar_view_for_test()->image_for_test())));
 }
 
 }  // namespace ash