Fix display of "new" avatar menu in guest mode.

chrome/browser/ui/views/frame/avatar_button_manager.cc

Index: chrome/browser/ui/views/frame/avatar_button_manager.cc
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.cc b/chrome/browser/ui/views/frame/avatar_button_manager.cc
index c9bbfbd094d2b64f25888ad0103291f574537fa0..eb80888dc13525feebc3899d807d8f1a7b8e66f8 100644
--- a/chrome/browser/ui/views/frame/avatar_button_manager.cc
+++ b/chrome/browser/ui/views/frame/avatar_button_manager.cc
@@ -22,12 +22,14 @@ void AvatarButtonManager::Update(AvatarButtonStyle style) {
   // This should never be called in incognito mode.
   DCHECK(browser_view->IsRegularOrGuestSession());
   ProfileAttributesEntry* unused;
-  if (browser_view->IsBrowserTypeNormal() &&
-      // Tests may not have a profile manager.
-      g_browser_process->profile_manager() &&
-      g_browser_process->profile_manager()
-          ->GetProfileAttributesStorage()
-          .GetProfileAttributesWithPath(profile->GetPath(), &unused)) {
+  if ((browser_view->IsBrowserTypeNormal() &&
+       // Tests may not have a profile manager.
+       g_browser_process->profile_manager() &&
+       g_browser_process->profile_manager()
+           ->GetProfileAttributesStorage()
+           .GetProfileAttributesWithPath(profile->GetPath(), &unused)) ||
+      // Desktop guest shows the avatar button.
+      browser_view->IsOffTheRecord()) {

[Evan Stade, 2016/05/27 20:01:26]

I failed to correctly copy (move) the logic from BrowserView::ShouldShowAvatar

     if (!view_) {
       view_ = new NewAvatarButton(this, style, profile);
       view_->set_id(VIEW_ID_AVATAR_BUTTON);