Make sure auth error reporting handles guest mode correctly.

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

 // Copyright 2014 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 "chrome/browser/ui/views/profiles/new_avatar_button.h"
 
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
@@ skipping 38 matching lines @@
   const int kMaxCharactersToDisplay = 15;
 
   const gfx::FontList font_list;
   return gfx::ElideText(
       original_text,
       font_list,
       font_list.GetExpectedTextWidth(kMaxCharactersToDisplay),
       gfx::ELIDE_AT_END);
 }
 
+SigninErrorController* GetSigninErrorController(Browser* browser) {

[noms (inactive), 2014/05/23 16:59:57]

Maybe this should go in profiles_state.h, given that it gets defined twice (and
probably twice more for the Mac)

[Roger Tawa OOO till Jul 10th, 2014/05/23 20:54:37]

Done.

+  ProfileOAuth2TokenService* token_service =
+      ProfileOAuth2TokenServiceFactory::GetForProfile(browser->profile());
+  return token_service ? token_service->signin_error_controller() : NULL;
+}
+
 }  // namespace
 
 NewAvatarButton::NewAvatarButton(
     views::ButtonListener* listener,
     const base::string16& profile_name,
     AvatarButtonStyle button_style,
     Browser* browser)
     : MenuButton(listener, GetElidedText(profile_name), NULL, true),
       browser_(browser) {
   set_animate_on_state_change(false);
@@ skipping 28 matching lines @@
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_GLASS_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     set_menu_marker(
         rb->GetImageNamed(IDR_AVATAR_GLASS_BUTTON_DROPARROW).ToImageSkia());
   }
 
   g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 
   // Subscribe to authentication error changes so that the avatar button
-  // can update itself.
-  SigninErrorController* error =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
-          signin_error_controller();
-  error->AddObserver(this);
-  OnErrorChanged();
+  // can update itself.  Note that guest mode profiles won't have a token
+  // service.
+  SigninErrorController* error = GetSigninErrorController(browser_);
+  if (error) {
+    error->AddObserver(this);
+    OnErrorChanged();
+  }
 
   SchedulePaint();
 }
 
 NewAvatarButton::~NewAvatarButton() {
   g_browser_process->profile_manager()->
       GetProfileInfoCache().RemoveObserver(this);
-  SigninErrorController* error =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
-          signin_error_controller();
-  error->RemoveObserver(this);
+  SigninErrorController* error = GetSigninErrorController(browser_);
+  if (error)
+    error->RemoveObserver(this);
 }
 
 void NewAvatarButton::OnPaintText(gfx::Canvas* canvas, PaintButtonMode mode) {
   // Get text bounds, and then adjust for the top and RTL languages.
   gfx::Rect rect = GetTextBounds();
   rect.Offset(0, -rect.y());
   if (rect.width() > 0)
     rect.set_x(GetMirroredXForRect(rect));
 
   canvas->DrawStringRectWithHalo(
@@ skipping 18 matching lines @@
 void NewAvatarButton::OnProfileNameChanged(
       const base::FilePath& profile_path,
       const base::string16& old_profile_name) {
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::OnErrorChanged() {
   gfx::ImageSkia icon;
 
   // If there is an error, show an warning icon.
-  SigninErrorController* error =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(browser_->profile())->
-          signin_error_controller();
-  if (error->HasError()) {
+  const SigninErrorController* error = GetSigninErrorController(browser_);
+  if (error && error->HasError()) {
     ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
     icon = *rb->GetImageNamed(IDR_WARNING).ToImageSkia();
   }
 
   SetIcon(icon);
   UpdateAvatarButtonAndRelayoutParent();
 }
 
 void NewAvatarButton::UpdateAvatarButtonAndRelayoutParent() {
   // We want the button to resize if the new text is shorter.
   SetText(GetElidedText(
       profiles::GetAvatarNameForProfile(browser_->profile())));
   ClearMaxTextSize();
 
   // Because the width of the button might have changed, the parent browser
   // frame needs to recalculate the button bounds and redraw it.
   if (parent())
     parent()->Layout();
 }