ash: Fix system tray avatar not updated regression

ash/common/system/user/rounded_image_view.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 "ash/common/system/user/rounded_image_view.h"
 
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/skia_util.h"
 
 namespace ash {
 namespace tray {
 
 RoundedImageView::RoundedImageView(int corner_radius) {
   for (int i = 0; i < 4; ++i)
     corner_radius_[i] = corner_radius;
 }
 
 RoundedImageView::~RoundedImageView() {}
 
-void RoundedImageView::SetImage(const gfx::ImageSkia& img,
+void RoundedImageView::SetImage(const gfx::ImageSkia& image,
                                 const gfx::Size& size) {
-  image_ = img;
   image_size_ = size;
 
   // Try to get the best image quality for the avatar.
-  resized_ = gfx::ImageSkiaOperations::CreateResizedImage(
-      image_, skia::ImageOperations::RESIZE_BEST, size);
+  resized_image_ = gfx::ImageSkiaOperations::CreateResizedImage(
+      image, skia::ImageOperations::RESIZE_BEST, size);
   if (GetWidget() && visible()) {
     PreferredSizeChanged();
     SchedulePaint();
   }
 }
 
 void RoundedImageView::SetCornerRadii(int top_left,
                                       int top_right,
                                       int bottom_right,
                                       int bottom_left) {
@@ skipping 15 matching lines @@
   image_bounds.Inset(GetInsets());
   const SkScalar kRadius[8] = {
       SkIntToScalar(corner_radius_[0]), SkIntToScalar(corner_radius_[0]),
       SkIntToScalar(corner_radius_[1]), SkIntToScalar(corner_radius_[1]),
       SkIntToScalar(corner_radius_[2]), SkIntToScalar(corner_radius_[2]),
       SkIntToScalar(corner_radius_[3]), SkIntToScalar(corner_radius_[3])};
   SkPath path;
   path.addRoundRect(gfx::RectToSkRect(image_bounds), kRadius);
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
-  canvas->DrawImageInPath(resized_, image_bounds.x(), image_bounds.y(), path,
-                          flags);
+  canvas->DrawImageInPath(resized_image_, image_bounds.x(), image_bounds.y(),
+                          path, flags);
 }
 
 }  // namespace tray
 }  // namespace ash