Avoid CHECK() failure when painting avatar menu button

chrome/browser/ui/views/profiles/avatar_menu_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/avatar_menu_button.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 45 matching lines @@
 const char* AvatarMenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
   if (!icon_.get())
     return;
 
   if (old_height_ != height() || button_icon_.isNull()) {
     old_height_ = height();
-    button_icon_ = *profiles::GetAvatarIconForTitleBar(
-        *icon_, is_rectangle_, width(), height()).ToImageSkia();
+    button_icon_ = profiles::GetAvatarIconForTitleBar(
+        *icon_, is_rectangle_, width(), height()).AsImageSkia();
   }
 
   // Scale the image to fit the width of the button.
   int dst_width = std::min(button_icon_.width(), width());
   // Truncate rather than rounding, so that for odd widths we put the extra
   // pixel on the left.
   int dst_x = (width() - dst_width) / 2;
 
   // Scale the height and maintain aspect ratio. This means that the
   // icon may not fit in the view. That's ok, we just vertically center it.
@@ skipping 93 matching lines @@
   return !disabled_ &&
          views::ViewTargeterDelegate::DoesIntersectRect(target, rect);
 }
 
 // views::MenuButtonListener implementation
 void AvatarMenuButton::OnMenuButtonClicked(views::View* source,
                                            const gfx::Point& point) {
   if (!disabled_)
     chrome::ShowAvatarMenu(browser());
 }