Handle app custom icon via aura::Window property.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 6ab22a9240ccfb2e399e01141913ef34b203e2f8..9dd81f41adb0027dcecb27e27dc2777064197ca4 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -2008,8 +2008,8 @@ TEST_P(ChromeLauncherControllerWithArcTest, ArcDeferredLaunchForActiveApp) {
   // Play Store app is ARC app that might be represented by native Chrome
   // platform app.
   model_->SetShelfItemDelegate(
-      shelf_id,
-      base::MakeUnique<ExtensionAppWindowLauncherItemController>(shelf_id));
+      shelf_id, base::MakeUnique<ExtensionAppWindowLauncherItemController>(
+                    shelf_id, launcher_controller_));
   launcher_controller_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
 
   // This launch request should be ignored in case of active app.
@@ -2336,6 +2336,7 @@ TEST_P(ChromeLauncherControllerWithArcTest, ArcCustomAppIcon) {
 
   // Set custom icon on active item. Icon should change to custom.
   arc_test_.app_instance()->SendTaskDescription(2, std::string(), png_data);
+  base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(item_delegate->image_set_by_controller());
 
   // Switch back to the item without custom icon. Icon should be changed to
@@ -3650,7 +3651,8 @@ TEST_F(ChromeLauncherControllerTest, MultipleAppIconLoaders) {
                     std::unique_ptr<AppIconLoader>(app_icon_loader2));
 
   launcher_controller_->CreateAppLauncherItem(
-      base::MakeUnique<ExtensionAppWindowLauncherItemController>(shelf_id3),
+      base::MakeUnique<ExtensionAppWindowLauncherItemController>(
+          shelf_id3, launcher_controller_),
       ash::STATUS_RUNNING);
   EXPECT_EQ(0, app_icon_loader1->fetch_count());
   EXPECT_EQ(0, app_icon_loader1->clear_count());
@@ -3658,7 +3660,8 @@ TEST_F(ChromeLauncherControllerTest, MultipleAppIconLoaders) {
   EXPECT_EQ(0, app_icon_loader2->clear_count());
 
   launcher_controller_->CreateAppLauncherItem(
-      base::MakeUnique<ExtensionAppWindowLauncherItemController>(shelf_id2),
+      base::MakeUnique<ExtensionAppWindowLauncherItemController>(
+          shelf_id2, launcher_controller_),
       ash::STATUS_RUNNING);
   EXPECT_EQ(0, app_icon_loader1->fetch_count());
   EXPECT_EQ(0, app_icon_loader1->clear_count());
@@ -3666,7 +3669,8 @@ TEST_F(ChromeLauncherControllerTest, MultipleAppIconLoaders) {
   EXPECT_EQ(0, app_icon_loader2->clear_count());
 
   launcher_controller_->CreateAppLauncherItem(
-      base::MakeUnique<ExtensionAppWindowLauncherItemController>(shelf_id1),
+      base::MakeUnique<ExtensionAppWindowLauncherItemController>(
+          shelf_id1, launcher_controller_),
       ash::STATUS_RUNNING);
   EXPECT_EQ(1, app_icon_loader1->fetch_count());
   EXPECT_EQ(0, app_icon_loader1->clear_count());