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

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

 // Copyright 2015 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/ui/app_list/arc/arc_app_icon.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <utility>
@@ skipping 231 matching lines @@
 // static
 bool ArcAppIcon::IsSafeDecodingDisabledForTesting() {
   return disable_safe_decoding_for_testing;
 }
 
 ArcAppIcon::ArcAppIcon(content::BrowserContext* context,
                        const std::string& app_id,
                        int resource_size_in_dip,
                        Observer* observer)
     : context_(context),
-      app_id_(GetAppFromAppOrGroupId(context, app_id)),
+      app_id_(app_id),
+      mapped_app_id_(GetAppFromAppOrGroupId(context, app_id)),
       resource_size_in_dip_(resource_size_in_dip),
       observer_(observer),
       weak_ptr_factory_(this) {
   CHECK(observer_ != nullptr);
   source_ = new Source(weak_ptr_factory_.GetWeakPtr(), resource_size_in_dip);
   gfx::Size resource_size(resource_size_in_dip, resource_size_in_dip);
   image_skia_ = gfx::ImageSkia(source_, resource_size);
 }
 
 ArcAppIcon::~ArcAppIcon() {
 }
 
 void ArcAppIcon::LoadForScaleFactor(ui::ScaleFactor scale_factor) {
   // 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);
+  DCHECK_NE(app_id(), arc::kPlayStoreAppId);
 
   const ArcAppListPrefs* const prefs = ArcAppListPrefs::Get(context_);
   DCHECK(prefs);
 
-  const base::FilePath path = prefs->GetIconPath(app_id_, scale_factor);
+  const base::FilePath path = prefs->GetIconPath(mapped_app_id_, scale_factor);
   if (path.empty())
     return;
 
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
-      base::Bind(&ArcAppIcon::ReadOnFileThread, scale_factor, path,
-                 prefs->MaybeGetIconPathForDefaultApp(app_id_, scale_factor)),
+      base::Bind(
+          &ArcAppIcon::ReadOnFileThread, scale_factor, path,
+          prefs->MaybeGetIconPathForDefaultApp(mapped_app_id_, scale_factor)),
       base::Bind(&ArcAppIcon::OnIconRead, weak_ptr_factory_.GetWeakPtr()));
 }
 
 void ArcAppIcon::MaybeRequestIcon(ui::ScaleFactor scale_factor) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(context_);
   DCHECK(prefs);
 
   // ArcAppListPrefs notifies ArcAppModelBuilder via Observer when icon is ready
   // and ArcAppModelBuilder refreshes the icon of the corresponding item by
   // calling LoadScaleFactor.
-  prefs->MaybeRequestIcon(app_id_, scale_factor);
+  prefs->MaybeRequestIcon(mapped_app_id_, scale_factor);
 }
 
 // static
 std::unique_ptr<ArcAppIcon::ReadResult> ArcAppIcon::ReadOnFileThread(
     ui::ScaleFactor scale_factor,
     const base::FilePath& path,
     const base::FilePath& default_app_path) {
   DCHECK(!path.empty());
 
   base::FilePath path_to_read;
@@ skipping 74 matching lines @@
 void ArcAppIcon::DiscardDecodeRequest(DecodeRequest* request) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   auto it = std::find_if(decode_requests_.begin(), decode_requests_.end(),
                          [request](const std::unique_ptr<DecodeRequest>& ptr) {
                            return ptr.get() == request;
                          });
   CHECK(it != decode_requests_.end());
   decode_requests_.erase(it);
 }