[Merge M60] arc: Fix default app icon for CrossOver app.

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

Index: chrome/browser/ui/app_list/arc/arc_app_icon.h
diff --git a/chrome/browser/ui/app_list/arc/arc_app_icon.h b/chrome/browser/ui/app_list/arc/arc_app_icon.h
index 882640e22f7146fc03a0f1868bb794cec5d481e0..c5ce9bcda3fd7f57028247125eff549d97d7f697 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_icon.h
+++ b/chrome/browser/ui/app_list/arc/arc_app_icon.h
@@ -94,10 +94,13 @@ class ArcAppIcon {
   void Update(const gfx::ImageSkia* image);
   void DiscardDecodeRequest(DecodeRequest* request);
 
-  content::BrowserContext* context_;
-  std::string app_id_;
+  content::BrowserContext* const context_;
+  const std::string app_id_;
+  // Contains app id that is actually used to read an icon resource to support
+  // shelf group mapping to shortcut.
+  const std::string mapped_app_id_;
   const int resource_size_in_dip_;
-  Observer* observer_;
+  Observer* const observer_;
 
   Source* source_ = nullptr;  // Owned by ImageSkia storage.
   gfx::ImageSkia image_skia_;