ash: HiDPI user avatar for SessionController

ash/common/system/user/tray_user.cc

 // Copyright (c) 2012 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/tray_user.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
@@ skipping 227 matching lines @@
 
 void TrayUser::UpdateAvatarImage(LoginStatus status) {
   const SessionController* const session_controller =
       Shell::Get()->session_controller();
   if (!avatar_ || user_index_ >= session_controller->NumberOfLoggedInUsers())
     return;
 
   const mojom::UserSession* const user_session =
       session_controller->GetUserSession(user_index_);
   CHECK(user_session);
-  // TODO(xiyuan); HiDpi avatar support. http://crbug.com/702689
-  avatar_->SetImage(gfx::ImageSkia::CreateFrom1xBitmap(user_session->avatar),
+  avatar_->SetImage(user_session->avatar,
                     gfx::Size(kTrayItemSize, kTrayItemSize));
 
   // Unit tests might come here with no images for some users.
   if (avatar_->size().IsEmpty())
     avatar_->SetSize(gfx::Size(kTrayItemSize, kTrayItemSize));
 }
 
 void TrayUser::UpdateLayoutOfItem() {
   UpdateAfterShelfAlignmentChange(system_tray()->shelf_alignment());
 }
 
 }  // namespace ash