Handle app custom icon via aura::Window property.

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

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 2311 matching lines @@
 
   // No custom icon set. Acitivating windows should not change icon.
   EXPECT_FALSE(item_delegate->image_set_by_controller());
   window1->Activate();
   EXPECT_FALSE(item_delegate->image_set_by_controller());
   window2->Activate();
   EXPECT_FALSE(item_delegate->image_set_by_controller());
 
   // 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
   // default.
   window1->Activate();
   EXPECT_FALSE(item_delegate->image_set_by_controller());
   // Test that setting an invalid icon should not change custom icon.
   arc_test_.app_instance()->SendTaskDescription(1, std::string(), png_data);
   EXPECT_TRUE(item_delegate->image_set_by_controller());
   arc_test_.app_instance()->SendTaskDescription(1, std::string(),
@@ skipping 1948 matching lines @@
   EXPECT_EQ(3u, shelf_controller->added_count());
   EXPECT_EQ(1u, shelf_controller->removed_count());
 
   // Remove an item from Chrome's model; ShelfController should be notified.
   model_.RemoveItemAt(2);
   EXPECT_EQ(2, model_.item_count());
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(3u, shelf_controller->added_count());
   EXPECT_EQ(2u, shelf_controller->removed_count());
 }