ash: Fix system tray avatar not updated regression

ash/common/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/common/session/session_controller.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/system/user/tray_user.h"
 #include "ash/common/system/user/user_view.h"
 #include "ash/common/test/test_session_controller_client.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/animation/animation_container_element.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_unittest_util.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 const char* kPredefinedUserEmails[] = {
     // This is intended to be capitalized.
     "First@tray",
     // This is intended to be capitalized.
     "Second@tray"};
 
+// Creates an ImageSkia with a 1x rep of the given dimensions and filled with
+// the given color.
+gfx::ImageSkia CreateImageSkiaWithColor(int width, int height, SkColor color) {
+  SkBitmap bitmap = gfx::test::CreateBitmap(width, height);
+  bitmap.eraseColor(color);
+  return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
+}
+
 class TrayUserTest : public test::AshTestBase {
  public:
   TrayUserTest() = default;
 
   // testing::Test:
   void SetUp() override;
 
   // This has to be called prior to first use with the proper configuration.
   void InitializeParameters(int users_logged_in, bool multiprofile);
 
@@ skipping 213 matching lines @@
   RunAllPendingInMessageLoop();
 
   const mojom::UserSession* active_user = controller()->GetUserSession(0);
   EXPECT_EQ(active_user->account_id, second_user->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);
   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(0)->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;
+  controller()->UpdateUserSession(std::move(user));
+  EXPECT_TRUE(gfx::test::AreImagesEqual(
+      gfx::Image(red_icon),
+      gfx::Image(tray_user(0)->avatar_view_for_test()->image_for_test())));
+}
+
 }  // namespace ash