[AvatarToolbarButton] Update guest mode: show label and generic icon

This CL adapts the guest mode avatar to an updated design.

Bug: 967317
Change-Id: Iccfd4c665238fe5731c52126a4c914c736d3ece0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810979
Auto-Submit: Jan Krcal <jkrcal@chromium.org>
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697752}

chrome/browser/ui/views/profiles/avatar_toolbar_button.cc

@@ -203,6 +203,10 @@ void AvatarToolbarButton::UpdateText() {
       text = l10n_util::GetStringUTF16(IDS_AVATAR_BUTTON_SYNC_PAUSED);
       break;
     case State::kGuestSession:
+      if (base::FeatureList::IsEnabled(features::kAnimatedAvatarButton)) {
+        text = l10n_util::GetStringUTF16(IDS_GUEST_PROFILE_NAME);
+      }
+      break;
     case State::kGenericProfile:
     case State::kNormal:
       // Default treatment -- no text, no color.
@@ -391,6 +395,10 @@ gfx::ImageSkia AvatarToolbarButton::GetAvatarIcon(
     case State::kIncognitoProfile:
       return gfx::CreateVectorIcon(kIncognitoIcon, icon_size, icon_color);
     case State::kGuestSession:
+      if (base::FeatureList::IsEnabled(features::kAnimatedAvatarButton)) {
+        return gfx::CreateVectorIcon(kUserAccountAvatarIcon, icon_size,
+                                     icon_color);
+      }
       return gfx::CreateVectorIcon(kUserMenuGuestIcon, icon_size, icon_color);
     case State::kGenericProfile:
       return gfx::CreateVectorIcon(kUserAccountAvatarIcon, icon_size,