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

ash/system/user/tray_user.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 "ash/system/user/tray_user.h"
 
 #include "ash/session/session_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
@@ skipping 188 matching lines @@
 }
 
 void TrayUser::UpdateAvatarImage(LoginStatus status) {
   const SessionController* session_controller =
       Shell::Get()->session_controller();
   if (!avatar_ || session_controller->NumberOfLoggedInUsers() == 0)
     return;
 
   const mojom::UserSession* const user_session =
       session_controller->GetUserSession(0);
-  avatar_->SetImage(user_session->avatar,
+  avatar_->SetImage(user_session->user_info->avatar,
                     gfx::Size(kTrayItemSize, kTrayItemSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange();
 }
 
 }  // namespace ash