Modify ARC icon code to use the new mojom interfaces.

This is the follow up for CL:2251600. Modify the ARC code to use the
new mojom interfaces and structure RawIconPngData.

TODO: Add some test cases for the adaptive icon.

Design doc: go/appservice-adaptive-icon

BUG=1083331

Change-Id: I1600d11af9a6477e6923f8e1f43d79fa52cf79f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2286251
Commit-Queue: Nancy Wang <nancylingwang@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Yury Khmel <khmel@chromium.org>
Reviewed-by: Long Cheng <lgcheng@google.com>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790631}

chrome/browser/chromeos/apps/apk_web_app_installer_browsertest.cc

@@ -48,14 +48,10 @@ const char kAppActivity[] = "test.app.activity";
 const char kAppActivity1[] = "test.app1.activity";
 const char kPackageName1[] = "com.test.app";
 
-const std::vector<uint8_t> GetFakeIconBytes() {
+arc::mojom::RawIconPngDataPtr GetFakeIconBytes() {
   auto fake_app_instance =
       std::make_unique<arc::FakeAppInstance>(/*app_host=*/nullptr);
-  std::string png_data_as_string;
-  EXPECT_TRUE(fake_app_instance->GenerateIconResponse(128, /*app_icon=*/true,
-                                                      &png_data_as_string));
-  return std::vector<uint8_t>(png_data_as_string.begin(),
-                              png_data_as_string.end());
+  return fake_app_instance->GenerateIconResponse(128, /*app_icon=*/true);
 }
 
 }  // namespace

chrome/browser/chromeos/apps/apk_web_app_installer_unittest.cc

@@ -32,13 +32,11 @@ constexpr int kGeneratedIconSize = 128;
 arc::mojom::RawIconPngDataPtr GetIconBytes() {
   auto fake_app_instance =
       std::make_unique<arc::FakeAppInstance>(/*app_host=*/nullptr);
-  std::string png_data_as_string;
-  EXPECT_TRUE(fake_app_instance->GenerateIconResponse(
-      kGeneratedIconSize, /*app_icon=*/true, &png_data_as_string));
-  arc::mojom::RawIconPngDataPtr icon = arc::mojom::RawIconPngData::New();
-  icon->is_adaptive_icon = false;
-  icon->icon_png_data = std::vector<uint8_t>(png_data_as_string.begin(),
-                                             png_data_as_string.end());
+  arc::mojom::RawIconPngDataPtr icon = fake_app_instance->GenerateIconResponse(
+      kGeneratedIconSize, /*app_icon=*/true);
+  EXPECT_TRUE(icon);
+  if (icon)
+    EXPECT_TRUE(icon->icon_png_data.has_value());
   return icon;
 }
 

chrome/browser/chromeos/apps/apk_web_app_service.cc

@@ -299,11 +299,24 @@ void ApkWebAppService::OnPackageInstalled(
   // The package is a web app but we don't have a corresponding browser-side
   // artifact. Install it.
   auto* instance = ARC_GET_INSTANCE_FOR_METHOD(
-      arc_app_list_prefs_->app_connection_holder(), RequestPackageIcon);
-  if (!instance)
+      arc_app_list_prefs_->app_connection_holder(), GetPackageIcon);
+  if (!instance) {
+    // TODO(crbug.com/1083331): Remove the RequestPackageIcon related code,
+    // when the ARC change is rolled in Chrome OS.
+    ARC_GET_INSTANCE_FOR_METHOD(arc_app_list_prefs_->app_connection_holder(),
+                                RequestPackageIcon);
+    if (!instance)
+      return;
+
+    instance->RequestPackageIcon(
+        package_info.package_name, kDefaultIconSize, /*normalize=*/false,
+        base::BindOnce(
+            &ApkWebAppService::OnGetWebAppIcon, weak_ptr_factory_.GetWeakPtr(),
+            package_info.package_name, package_info.web_app_info.Clone()));
     return;
+  }
 
-  instance->RequestPackageIcon(
+  instance->GetPackageIcon(
       package_info.package_name, kDefaultIconSize, /*normalize=*/false,
       base::BindOnce(&ApkWebAppService::OnDidGetWebAppIcon,
                      weak_ptr_factory_.GetWeakPtr(), package_info.package_name,
@@ -439,13 +452,20 @@ void ApkWebAppService::OnWebAppUninstalled(const web_app::AppId& web_app_id) {
   }
 }
 
-void ApkWebAppService::OnDidGetWebAppIcon(
+void ApkWebAppService::OnGetWebAppIcon(
     const std::string& package_name,
     arc::mojom::WebAppInfoPtr web_app_info,
     const std::vector<uint8_t>& icon_png_data) {
   arc::mojom::RawIconPngDataPtr icon = arc::mojom::RawIconPngData::New();
   icon->is_adaptive_icon = false;
   icon->icon_png_data = std::vector<uint8_t>(icon_png_data);
+  OnDidGetWebAppIcon(package_name, std::move(web_app_info), std::move(icon));
+}
+
+void ApkWebAppService::OnDidGetWebAppIcon(
+    const std::string& package_name,
+    arc::mojom::WebAppInfoPtr web_app_info,
+    arc::mojom::RawIconPngDataPtr icon) {
   ApkWebAppInstaller::Install(
       profile_, std::move(web_app_info), std::move(icon),
       base::BindOnce(&ApkWebAppService::OnDidFinishInstall,

chrome/browser/chromeos/apps/apk_web_app_service.h

@@ -94,9 +94,14 @@ class ApkWebAppService : public KeyedService,
   // web_app::AppRegistrarObserver overrides.
   void OnWebAppUninstalled(const web_app::AppId& web_app_id) override;
 
+  // TODO(crbug.com/1083331): Remove this function, when the ARC change is
+  // rolled in Chrome OS.
+  void OnGetWebAppIcon(const std::string& package_name,
+                       arc::mojom::WebAppInfoPtr web_app_info,
+                       const std::vector<uint8_t>& icon_png_data);
   void OnDidGetWebAppIcon(const std::string& package_name,
                           arc::mojom::WebAppInfoPtr web_app_info,
-                          const std::vector<uint8_t>& icon_png_data);
+                          arc::mojom::RawIconPngDataPtr icon);
   void OnDidFinishInstall(const std::string& package_name,
                           const web_app::AppId& web_app_id,
                           bool is_web_only_twa,

chrome/browser/chromeos/arc/app_shortcuts/arc_app_shortcuts_request.cc

@@ -10,7 +10,9 @@
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/apps/app_service/app_icon_factory.h"
 #include "chrome/browser/chromeos/arc/icon_decode_request.h"
+#include "chrome/common/chrome_features.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/session/arc_bridge_service.h"
 
@@ -77,11 +79,33 @@ void ArcAppShortcutsRequest::OnGetAppShortcutItems(
     item.rank = shortcut_item_ptr->rank;
     items_->emplace_back(std::move(item));
 
+    if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+      apps::ArcRawIconPngDataToImageSkia(
+          std::move(shortcut_item_ptr->icon), kAppShortcutIconSize,
+          base::BindOnce(&ArcAppShortcutsRequest::OnSingleIconDecodeRequestDone,
+                         weak_ptr_factory_.GetWeakPtr(), items_->size() - 1));
+      continue;
+    }
+
+    if (!shortcut_item_ptr->icon || !shortcut_item_ptr->icon->icon_png_data ||
+        shortcut_item_ptr->icon->icon_png_data->empty()) {
+      // TODO(crbug.com/1083331): Remove the icon_png related change, when the
+      // ARC change is rolled in Chrome OS.
+      icon_decode_requests_.emplace_back(std::make_unique<IconDecodeRequest>(
+          base::BindOnce(&ArcAppShortcutsRequest::OnSingleIconDecodeRequestDone,
+                         weak_ptr_factory_.GetWeakPtr(), items_->size() - 1),
+          kAppShortcutIconSize));
+      icon_decode_requests_.back()->StartWithOptions(
+          shortcut_item_ptr->icon_png);
+      continue;
+    }
+
     icon_decode_requests_.emplace_back(std::make_unique<IconDecodeRequest>(
         base::BindOnce(&ArcAppShortcutsRequest::OnSingleIconDecodeRequestDone,
                        weak_ptr_factory_.GetWeakPtr(), items_->size() - 1),
         kAppShortcutIconSize));
-    icon_decode_requests_.back()->StartWithOptions(shortcut_item_ptr->icon_png);
+    icon_decode_requests_.back()->StartWithOptions(
+        shortcut_item_ptr->icon->icon_png_data.value());
   }
 }
 

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

@@ -537,26 +537,50 @@ void ArcAppListPrefs::RequestIcon(const std::string& app_id,
 void ArcAppListPrefs::SendIconRequest(const std::string& app_id,
                                       const AppInfo& app_info,
                                       const ArcAppIconDescriptor& descriptor) {
-  base::OnceCallback<void(const std::vector<uint8_t>& /* icon_png_data */)>
-      callback =
-          base::BindOnce(&ArcAppListPrefs::OnIcon,
-                         weak_ptr_factory_.GetWeakPtr(), app_id, descriptor);
+  auto callback =
+      base::BindOnce(&ArcAppListPrefs::OnIcon, weak_ptr_factory_.GetWeakPtr(),
+                     app_id, descriptor);
   if (app_info.icon_resource_id.empty()) {
     auto* app_instance =
-        ARC_GET_INSTANCE_FOR_METHOD(app_connection_holder(), RequestAppIcon);
-    if (!app_instance)
+        ARC_GET_INSTANCE_FOR_METHOD(app_connection_holder(), GetAppIcon);
+    if (!app_instance) {
+      // TODO(crbug.com/1083331): Remove the RequestAppIcon related change, when
+      // the ARC change is rolled in Chrome OS.
+      app_instance =
+          ARC_GET_INSTANCE_FOR_METHOD(app_connection_holder(), RequestAppIcon);
+      if (app_instance) {
+        auto callback =
+            base::BindOnce(&ArcAppListPrefs::OnGetIcon,
+                           weak_ptr_factory_.GetWeakPtr(), app_id, descriptor);
+        app_instance->RequestAppIcon(app_info.package_name, app_info.activity,
+                                     descriptor.GetSizeInPixels(),
+                                     std::move(callback));
+      }
       return;  // Error is logged in macro.
-    app_instance->RequestAppIcon(app_info.package_name, app_info.activity,
-                                 descriptor.GetSizeInPixels(),
-                                 std::move(callback));
+    }
+    app_instance->GetAppIcon(app_info.package_name, app_info.activity,
+                             descriptor.GetSizeInPixels(), std::move(callback));
   } else {
     auto* app_instance = ARC_GET_INSTANCE_FOR_METHOD(app_connection_holder(),
-                                                     RequestShortcutIcon);
-    if (!app_instance)
+                                                     GetAppShortcutIcon);
+    if (!app_instance) {
+      // TODO(crbug.com/1083331): Remove the RequestAppIcon related change, when
+      // the ARC change is rolled in Chrome OS.
+      app_instance = ARC_GET_INSTANCE_FOR_METHOD(app_connection_holder(),
+                                                 RequestShortcutIcon);
+      if (app_instance) {
+        auto callback =
+            base::BindOnce(&ArcAppListPrefs::OnGetIcon,
+                           weak_ptr_factory_.GetWeakPtr(), app_id, descriptor);
+        app_instance->RequestAppIcon(app_info.package_name, app_info.activity,
+                                     descriptor.GetSizeInPixels(),
+                                     std::move(callback));
+      }
       return;  // Error is logged in macro.
-    app_instance->RequestShortcutIcon(app_info.icon_resource_id,
-                                      descriptor.GetSizeInPixels(),
-                                      std::move(callback));
+    }
+    app_instance->GetAppShortcutIcon(app_info.icon_resource_id,
+                                     descriptor.GetSizeInPixels(),
+                                     std::move(callback));
   }
 }
 
@@ -1634,12 +1658,25 @@ void ArcAppListPrefs::OnPackageRemoved(const std::string& package_name) {
     observer.OnPackageRemoved(package_name, true);
 }
 
+void ArcAppListPrefs::OnGetIcon(const std::string& app_id,
+                                const ArcAppIconDescriptor& descriptor,
+                                const std::vector<uint8_t>& icon_png_data) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  arc::mojom::RawIconPngDataPtr icon = arc::mojom::RawIconPngData::New();
+  icon->is_adaptive_icon = false;
+  icon->icon_png_data =
+      std::vector<uint8_t>(icon_png_data.begin(), icon_png_data.end());
+  OnIcon(app_id, descriptor, std::move(icon));
+}
+
 void ArcAppListPrefs::OnIcon(const std::string& app_id,
                              const ArcAppIconDescriptor& descriptor,
-                             const std::vector<uint8_t>& icon_png_data) {
+                             arc::mojom::RawIconPngDataPtr icon) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  if (icon_png_data.empty()) {
+  if (!icon || !icon->icon_png_data.has_value() ||
+      icon->icon_png_data->empty()) {
     LOG(WARNING) << "Cannot fetch icon for " << app_id;
     return;
   }
@@ -1649,10 +1686,6 @@ void ArcAppListPrefs::OnIcon(const std::string& app_id,
     return;
   }
 
-  arc::mojom::RawIconPngDataPtr icon = arc::mojom::RawIconPngData::New();
-  icon->is_adaptive_icon = false;
-  icon->icon_png_data =
-      std::vector<uint8_t>(icon_png_data.begin(), icon_png_data.end());
   InstallIcon(app_id, descriptor, std::move(icon));
 }
 

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

@@ -396,9 +396,14 @@ class ArcAppListPrefs : public KeyedService,
   void OnUninstallShortcut(const std::string& package_name,
                            const std::string& intent_uri) override;
   void OnPackageRemoved(const std::string& package_name) override;
+  // TODO(crbug.com/1083331): Remove this function, when the ARC change is
+  // rolled in Chrome OS.
+  void OnGetIcon(const std::string& app_id,
+                 const ArcAppIconDescriptor& descriptor,
+                 const std::vector<uint8_t>& icon_png_data);
   void OnIcon(const std::string& app_id,
               const ArcAppIconDescriptor& descriptor,
-              const std::vector<uint8_t>& icon_png_data);
+              arc::mojom::RawIconPngDataPtr icon);
   void OnIconLoaded(const std::string& app_id,
                     const ArcAppIconDescriptor& descriptor,
                     arc::mojom::RawIconPngDataPtr icon);

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

@@ -34,10 +34,10 @@ class MockArcAppListPrefsObserver : public ArcAppListPrefs::Observer {
                     const std::string& package_name,
                     const std::string& activity,
                     const std::string& intent));
-  MOCK_METHOD3(OnTaskDescriptionUpdated,
+  MOCK_METHOD3(OnTaskDescriptionChanged,
                void(int32_t task_id,
                     const std::string& label,
-                    const arc::mojom::RawIconPngDataPtr& icon));
+                    const arc::mojom::RawIconPngData& icon));
   MOCK_METHOD1(OnTaskDestroyed, void(int32_t task_id));
   MOCK_METHOD1(OnTaskSetActive, void(int32_t task_id));
   MOCK_METHOD2(OnNotificationsEnabledChanged,

chrome/browser/ui/app_list/search/arc/arc_app_data_search_result.cc

@@ -9,8 +9,10 @@
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/apps/app_service/app_icon_factory.h"
 #include "chrome/browser/chromeos/arc/icon_decode_request.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
+#include "chrome/common/chrome_features.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/session/arc_bridge_service.h"
 #include "third_party/skia/include/core/SkPath.h"
@@ -90,7 +92,25 @@ ArcAppDataSearchResult::ArcAppDataSearchResult(
   }
 
   // TODO(warx): set default images when icon_png_data() is not available.
-  if (!icon_png_data()) {
+  if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+    if (!data_->icon) {
+      SetIcon(gfx::ImageSkia());
+      return;
+    }
+
+    apps::ArcRawIconPngDataToImageSkia(
+        std::move(data_->icon),
+        ash::AppListConfig::instance().search_tile_icon_dimension(),
+        base::BindOnce(&ArcAppDataSearchResult::ApplyIcon,
+                       weak_ptr_factory_.GetWeakPtr()));
+    return;
+  }
+
+  // TODO(crbug.com/1083331): Remove the checking !data_->icon_png_data, when
+  // the ARC change is rolled in Chrome OS.
+  if ((!data_->icon || !data_->icon->icon_png_data ||
+       data_->icon->icon_png_data->empty()) &&
+      !data_->icon_png_data) {
     SetIcon(gfx::ImageSkia());
     return;
   }

chrome/browser/ui/app_list/search/arc/arc_app_data_search_result.h

@@ -39,7 +39,13 @@ class ArcAppDataSearchResult : public ChromeSearchResult {
     return data_->launch_intent_uri;
   }
   const base::Optional<std::vector<uint8_t>>& icon_png_data() const {
-    return data_->icon_png_data;
+    // TODO(crbug.com/1083331): Remove the checking, when the ARC change is
+    // rolled in Chrome OS.
+    if (!data_->icon || !data_->icon->icon_png_data ||
+        data_->icon->icon_png_data->empty()) {
+      return data_->icon_png_data;
+    }
+    return data_->icon->icon_png_data;
   }
 
   // Set |icon| to SearchResult. |icon| may be customized based on |data_|.

chrome/browser/ui/app_list/search/arc/arc_app_shortcut_search_result.cc

@@ -11,12 +11,14 @@
 #include "ash/public/cpp/app_list/app_list_types.h"
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/apps/app_service/app_icon_factory.h"
 #include "chrome/browser/chromeos/arc/icon_decode_request.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/app_service/app_service_app_icon_loader.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -43,11 +45,28 @@ ArcAppShortcutSearchResult::ArcAppShortcutSearchResult(
 
   const int icon_dimension =
       ash::AppListConfig::instance().search_tile_icon_dimension();
-  icon_decode_request_ = std::make_unique<arc::IconDecodeRequest>(
-      base::BindOnce(&ArcAppShortcutSearchResult::SetIcon,
-                     base::Unretained(this)),
-      icon_dimension);
-  icon_decode_request_->StartWithOptions(data_->icon_png);
+  if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+    DCHECK(data_->icon);
+    apps::ArcRawIconPngDataToImageSkia(
+        std::move(data_->icon), icon_dimension,
+        base::BindOnce(&ArcAppShortcutSearchResult::SetIcon,
+                       base::Unretained(this)));
+  } else if (data_->icon && data_->icon->icon_png_data &&
+             !data_->icon->icon_png_data->empty()) {
+    icon_decode_request_ = std::make_unique<arc::IconDecodeRequest>(
+        base::BindOnce(&ArcAppShortcutSearchResult::SetIcon,
+                       base::Unretained(this)),
+        icon_dimension);
+    icon_decode_request_->StartWithOptions(data_->icon->icon_png_data.value());
+  } else {
+    // TODO(crbug.com/1083331): Remove when the ARC change is rolled in Chrome
+    // OS.
+    icon_decode_request_ = std::make_unique<arc::IconDecodeRequest>(
+        base::BindOnce(&ArcAppShortcutSearchResult::SetIcon,
+                       base::Unretained(this)),
+        icon_dimension);
+    icon_decode_request_->StartWithOptions(data_->icon_png);
+  }
 
   badge_icon_loader_ = std::make_unique<AppServiceAppIconLoader>(
       profile_,

chrome/browser/ui/app_list/search/arc/arc_playstore_search_provider.cc

@@ -16,6 +16,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h"
+#include "chrome/common/chrome_features.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "chromeos/constants/chromeos_pref_names.h"
 #include "components/arc/app/arc_playstore_search_request_state.h"
@@ -72,8 +73,17 @@ bool IsInvalidResult(const arc::mojom::AppDiscoveryResult& result) {
     return true;
 
   // The result doesn't have a valid launcher icon.
-  if (result.icon_png_data.empty())
+  //
+  // TODO(crbug.com/1083331): Remove the checking result.icon_png_data.empty(),
+  // when the ARC change is rolled in Chrome OS.
+  if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+    if (!result.icon)
+      return true;
+  } else if ((!result.icon || !result.icon->icon_png_data ||
+              result.icon->icon_png_data->empty()) &&
+             result.icon_png_data.empty()) {
     return true;
+  }
 
   // The result doesn't have a valid package name.
   if (!result.package_name || result.package_name->empty())

chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.cc

@@ -11,10 +11,12 @@
 #include "base/bind.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/apps/app_service/app_icon_factory.h"
 #include "chrome/browser/chromeos/arc/icon_decode_request.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
 #include "chrome/browser/ui/app_list/arc/arc_playstore_app_context_menu.h"
+#include "chrome/common/chrome_features.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/mojom/app.mojom.h"
 #include "components/arc/session/arc_bridge_service.h"
@@ -121,6 +123,28 @@ ArcPlayStoreSearchResult::ArcPlayStoreSearchResult(
   SetResultType(is_instant_app() ? ash::AppListSearchResultType::kInstantApp
                                  : ash::AppListSearchResultType::kPlayStoreApp);
 
+  if (base::FeatureList::IsEnabled(features::kAppServiceAdaptiveIcon)) {
+    apps::ArcRawIconPngDataToImageSkia(
+        std::move(data_->icon),
+        ash::AppListConfig::instance().search_tile_icon_dimension(),
+        base::BindOnce(&ArcPlayStoreSearchResult::SetIcon,
+                       weak_ptr_factory_.GetWeakPtr()));
+    return;
+  }
+
+  if (!data_->icon || !data_->icon->icon_png_data ||
+      data_->icon->icon_png_data->empty()) {
+    // TODO(crbug.com/1083331): Remove the icon_png related change, when the ARC
+    // change is rolled in Chrome OS.
+    icon_decode_request_ = std::make_unique<arc::IconDecodeRequest>(
+        base::BindOnce(&ArcPlayStoreSearchResult::SetIcon,
+                       weak_ptr_factory_.GetWeakPtr()),
+        ash::AppListConfig::instance().search_tile_icon_dimension());
+    icon_decode_request_->set_normalized(true);
+    icon_decode_request_->StartWithOptions(data_->icon_png_data);
+    return;
+  }
+
   icon_decode_request_ = std::make_unique<arc::IconDecodeRequest>(
       base::BindOnce(&ArcPlayStoreSearchResult::SetIcon,
                      weak_ptr_factory_.GetWeakPtr()),

chrome/browser/ui/app_list/search/arc/arc_playstore_search_result.h

@@ -53,7 +53,7 @@ class ArcPlayStoreSearchResult : public ChromeSearchResult,
   }
   float review_score() const { return data_->review_score; }
   const std::vector<uint8_t>& icon_png_data() const {
-    return data_->icon_png_data;
+    return data_->icon->icon_png_data.value();
   }
 
   // ChromeSearchResult overrides:

chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

@@ -97,6 +97,7 @@ constexpr char kTestWindowTitle[] = "window1";
 constexpr char kTestWindowTitle2[] = "window2";
 constexpr char kTestWindowTitle3[] = "window3";
 constexpr int kAppAnimatedThresholdMs = 100;
+constexpr int kGeneratedIconSize = 32;
 
 std::string GetTestApp1Id(const std::string& package_name) {
   return ArcAppListPrefs::GetAppId(package_name, kTestAppActivity);
@@ -345,6 +346,8 @@ class ArcAppLauncherBrowserTest : public extensions::ExtensionBrowserTest {
     return arc::ArcServiceManager::Get()->arc_bridge_service();
   }
 
+  arc::FakeAppInstance* arc_instance() { return app_instance_.get(); }
+
  private:
   std::unique_ptr<arc::FakeAppInstance> app_instance_;
   std::unique_ptr<exo::WMHelper> wm_helper_;
@@ -713,8 +716,12 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, LogicalWindow) {
   app_host()->OnTaskCreated(1, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroupAndLogicalWindow(
                                 kTestShelfGroups[1], kTestLogicalWindows[1]));
-  app_host()->OnTaskDescriptionUpdated(1, kTestWindowTitles[1],
-                                       std::vector<uint8_t>());
+  arc_instance()->set_icon_response_type(
+      arc::FakeAppInstance::IconResponseType::ICON_RESPONSE_SEND_EMPTY);
+  app_host()->OnTaskDescriptionChanged(
+      1, kTestWindowTitles[1],
+      arc_instance()->GenerateIconResponse(kGeneratedIconSize,
+                                           false /* app_icon */));
   WaitForDecompressTask();
   ash::ShelfItemDelegate* delegate1 = GetShelfItemDelegate(shelf_id1);
 
@@ -725,8 +732,10 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, LogicalWindow) {
   app_host()->OnTaskCreated(2, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroupAndLogicalWindow(
                                 kTestShelfGroups[2], kTestLogicalWindows[2]));
-  app_host()->OnTaskDescriptionUpdated(2, kTestWindowTitles[2],
-                                       std::vector<uint8_t>());
+  app_host()->OnTaskDescriptionChanged(
+      2, kTestWindowTitles[2],
+      arc_instance()->GenerateIconResponse(kGeneratedIconSize,
+                                           false /* app_icon */));
 
   WaitForDecompressTask();
   ASSERT_EQ(delegate1, GetShelfItemDelegate(shelf_id1));
@@ -739,8 +748,10 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, LogicalWindow) {
         task_id, info->package_name, info->activity, info->name,
         CreateIntentUriWithShelfGroupAndLogicalWindow(
             kTestShelfGroups[task_id], kTestLogicalWindows[task_id]));
-    app_host()->OnTaskDescriptionUpdated(task_id, kTestWindowTitles[task_id],
-                                         std::vector<uint8_t>());
+    app_host()->OnTaskDescriptionChanged(
+        task_id, kTestWindowTitles[task_id],
+        arc_instance()->GenerateIconResponse(kGeneratedIconSize,
+                                             false /* app_icon */));
   }
 
   WaitForDecompressTask();
@@ -753,8 +764,10 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, LogicalWindow) {
   app_host()->OnTaskCreated(6, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroupAndLogicalWindow(
                                 kTestShelfGroups[6], kTestLogicalWindows[6]));
-  app_host()->OnTaskDescriptionUpdated(6, kTestWindowTitles[6],
-                                       std::vector<uint8_t>());
+  app_host()->OnTaskDescriptionChanged(
+      6, kTestWindowTitles[6],
+      arc_instance()->GenerateIconResponse(kGeneratedIconSize,
+                                           false /* app_icon */));
   ash::ShelfItemDelegate* delegate2 = GetShelfItemDelegate(shelf_id2);
 
   WaitForDecompressTask();
@@ -766,8 +779,10 @@ IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, LogicalWindow) {
   app_host()->OnTaskCreated(7, info->package_name, info->activity, info->name,
                             CreateIntentUriWithShelfGroupAndLogicalWindow(
                                 kTestShelfGroups[7], kTestLogicalWindows[7]));
-  app_host()->OnTaskDescriptionUpdated(7, kTestWindowTitles[7],
-                                       std::vector<uint8_t>());
+  app_host()->OnTaskDescriptionChanged(
+      7, kTestWindowTitles[7],
+      arc_instance()->GenerateIconResponse(kGeneratedIconSize,
+                                           false /* app_icon */));
 
   WaitForDecompressTask();
   ASSERT_EQ(delegate2, GetShelfItemDelegate(shelf_id2));

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -2544,10 +2544,13 @@ TEST_P(ChromeLauncherControllerWithArcTest, DISABLED_ArcCustomAppIcon) {
 
   // Generate icon for the testing app and use compressed png content as test
   // input. Take shortcut to separate from default app icon.
-  std::string png_data;
-  EXPECT_TRUE(arc_test_.app_instance()->GenerateIconResponse(
-      extension_misc::EXTENSION_ICON_SMALL, false /* app_icon */, &png_data));
-  EXPECT_FALSE(png_data.empty());
+  auto icon = arc_test_.app_instance()->GenerateIconResponse(
+      extension_misc::EXTENSION_ICON_SMALL, false /* app_icon */);
+  ASSERT_TRUE(icon);
+  ASSERT_TRUE(icon->icon_png_data.has_value());
+  EXPECT_FALSE(icon->icon_png_data->empty());
+  std::string png_data(icon->icon_png_data->begin(),
+                       icon->icon_png_data->end());
   // Some input that represents invalid png content.
   std::string invalid_png_data("aaaaaa");
 

components/arc/test/fake_app_instance.h

@@ -22,6 +22,8 @@ class FakeAppInstance : public mojom::AppInstance {
   enum class IconResponseType {
     // Generate and send good icon.
     ICON_RESPONSE_SEND_GOOD,
+    // Generate an empty icon.
+    ICON_RESPONSE_SEND_EMPTY,
     // Generate broken bad icon.
     ICON_RESPONSE_SEND_BAD,
     // Don't send icon.
@@ -207,14 +209,13 @@ class FakeAppInstance : public mojom::AppInstance {
   // fill |png_data_as_string| if icon for |dimension| was generated.
   bool GetIconResponse(int dimension, std::string* png_data_as_string);
   // Generates an icon for app or shorcut, determined by |app_icon| and returns:
-  //   false if |icon_response_type_| is IconResponseType::ICON_RESPONSE_SKIP.
-  //   true and valid png content in |png_data_as_string| if
-  //        |icon_response_type_| is IconResponseType::ICON_RESPONSE_SEND_GOOD.
-  //   true and invalid png content in |png_data_as_string| if
+  //   nullptr if |icon_response_type_| is IconResponseType::ICON_RESPONSE_SKIP.
+  //   valid raw icon png data if
+  //         |icon_response_type_| is IconResponseType::ICON_RESPONSE_SEND_GOOD.
+  //   invalid raw icon png data in |png_data_as_string| if
   //         |icon_response_type_| is IconResponseType::ICON_RESPONSE_SEND_BAD.
-  bool GenerateIconResponse(int dimension,
-                            bool app_icon,
-                            std::string* png_data_as_string);
+  arc::mojom::RawIconPngDataPtr GenerateIconResponse(int dimension,
+                                                     bool app_icon);
 
   int start_pai_request_count() const { return start_pai_request_count_; }
 
@@ -305,8 +306,7 @@ class FakeAppInstance : public mojom::AppInstance {
   // routed.
   mojo::Remote<mojom::AppHost> host_remote_;
 
-  bool GetFakeIcon(mojom::ScaleFactor scale_factor,
-                   std::string* png_data_as_string);
+  arc::mojom::RawIconPngDataPtr GetFakeIcon(mojom::ScaleFactor scale_factor);
 
   DISALLOW_COPY_AND_ASSIGN(FakeAppInstance);
 };