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

chrome/browser/ui/app_list/arc/arc_app_icon.cc

Index: chrome/browser/ui/app_list/arc/arc_app_icon.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.cc b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
index dfd61ec58758a16e33b8a32af7e1b07ba2419688..43e1912bb98fadf189b6543fa2f0dc8f05c399a3 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.cc
@@ -258,10 +258,14 @@ ArcAppIcon::~ArcAppIcon() {
 }
 
 void ArcAppIcon::LoadForScaleFactor(ui::ScaleFactor scale_factor) {
-  ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context_);
+  // We provide Play Store icon from Chrome resources and it is not expected
+  // that we have external load request.
+  DCHECK_NE(app_id_, arc::kPlayStoreAppId);
+
+  const ArcAppListPrefs* const prefs = ArcAppListPrefs::Get(context_);
   DCHECK(prefs);
 
-  base::FilePath path = prefs->GetIconPath(app_id_, scale_factor);
+  const base::FilePath path = prefs->GetIconPath(app_id_, scale_factor);
   if (path.empty())
     return;
 
@@ -363,8 +367,6 @@ void ArcAppIcon::Update(const gfx::ImageSkia* image) {
     }
   }
 
-  image_ = gfx::Image(image_skia_);
-
   observer_->OnIconUpdated(this);
 }