arc: Prevent overwriting of the Chrome Play Store icon.

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

 // Copyright 2016 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/chromeos/app_mode/arc/arc_kiosk_app_service.h>
 
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 156 matching lines @@
 ArcKioskAppService::~ArcKioskAppService() {
   maintenance_timeout_timer_.Stop();
 }
 
 void ArcKioskAppService::RequestNameAndIconUpdate() {
   // Request only once when app_icon_ is not initialized.
   if (!app_info_ || !app_info_->ready || app_icon_)
     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() {
   VLOG(2) << "Preconditions for kiosk app changed";
   app_id_ = GetAppId();
   if (app_id_.empty()) {
     VLOG(2) << "Kiosk app is not available";
     return;
   }
   app_info_ = ArcAppListPrefs::Get(profile_)->GetApp(app_id_);
@@ skipping 32 matching lines @@
     return std::string();
   // If |activity| and |intent| are not specified, return any app from the
   // package.
   if (app->activity().empty() && app->intent().empty())
     return *app_ids.begin();
   // Check that the app is registered for given package.
   return app_ids.count(app->app_id()) ? app->app_id() : std::string();
 }
 
 }  // namespace chromeos