[Merge M59] arc: Prevent overwriting of the Chrome Play Store icon.

chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc

Index: chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
index fd2c314b3c3e6573dac2b2d6d09f3b0d448763bc..ee2b2a90d097e7e0d11f0daf0ae543fb1b7874c2 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service.cc
@@ -174,9 +174,11 @@ void ArcKioskAppService::RequestNameAndIconUpdate() {
     return;
   app_icon_ = base::MakeUnique<ArcAppIcon>(profile_, app_id_,
                                            app_list::kGridIconDimension, this);
-  app_icon_->LoadForScaleFactor(ui::GetSupportedScaleFactor(
+  app_icon_->image_skia().GetRepresentation(ui::GetSupportedScaleFactor(
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()));
-  // Name and icon are updated when icon is loaded in OnIconUpdated()
+  // Apply default image now and in case icon is updated then OnIconUpdated()
+  // will be called additionally.
+  OnIconUpdated(app_icon_.get());
 }
 
 void ArcKioskAppService::PreconditionsChanged() {