Handle app custom icon via aura::Window property.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 "ash/public/cpp/shelf_item_delegate.h"
 #include "ash/public/cpp/window_properties.h"
@@ skipping 33 matching lines @@
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/test/test_app_window_icon_observer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/app_window/app_window.h"
@@ skipping 59 matching lines @@
 class TestEvent : public ui::Event {
  public:
   explicit TestEvent(ui::EventType type)
       : ui::Event(type, base::TimeTicks(), 0) {}
   ~TestEvent() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestEvent);
 };
 
-class TestAppWindowRegistryObserver
-    : public extensions::AppWindowRegistry::Observer {
- public:
-  explicit TestAppWindowRegistryObserver(Profile* profile)
-      : profile_(profile), icon_updates_(0) {
-    extensions::AppWindowRegistry::Get(profile_)->AddObserver(this);
-  }
-
-  ~TestAppWindowRegistryObserver() override {
-    extensions::AppWindowRegistry::Get(profile_)->RemoveObserver(this);
-  }
-
-  // Overridden from AppWindowRegistry::Observer:
-  void OnAppWindowIconChanged(AppWindow* app_window) override {
-    ++icon_updates_;
-  }
-
-  int icon_updates() { return icon_updates_; }
-
- private:
-  Profile* profile_;
-  int icon_updates_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver);
-};
-
 // Click the "All Apps" button from the app launcher start page. Assumes that
 // the app launcher is open to the start page.
 // |display_origin| is the top-left corner of the active display, in screen
 // coordinates.
 void ClickAllAppsButtonFromStartPage(ui::test::EventGenerator* generator,
                                      const gfx::Point& display_origin) {
   AppListServiceAshTestApi service_test;
 
   app_list::StartPageView* start_page_view = service_test.GetStartPageView();
   DCHECK(start_page_view);
@@ skipping 677 matching lines @@
   ASSERT_EQ(item_count, shelf_model()->item_count());
   const ash::ShelfItem& item1 = GetLastLauncherItem();
   ash::ShelfID item_id1 = item1.id;
   EXPECT_EQ(ash::TYPE_APP, item1.type);
   EXPECT_EQ(ash::STATUS_ACTIVE, item1.status);
 
   ash::wm::ActivateWindow(browser()->window()->GetNativeWindow());
   EXPECT_EQ(ash::STATUS_RUNNING, shelf_model()->ItemByID(item_id1)->status);
 }
 
-// Flaky on Linux ChromiumOS bot -- crbug/720601.
 // Test that opening an app sets the correct icon
-IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, DISABLED_SetIcon) {
-  TestAppWindowRegistryObserver test_observer(browser()->profile());
+IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, SetIcon) {
+  TestAppWindowIconObserver test_observer(browser()->profile());
 
   // Enable experimental APIs to allow panel creation.
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       extensions::switches::kEnableExperimentalExtensionApis);
 
   int base_shelf_item_count = shelf_model()->item_count();
-  ExtensionTestMessageListener completed_listener("Completed", false);
+  ExtensionTestMessageListener ready_listener("ready", true);
   LoadAndLaunchPlatformApp("app_icon", "Launched");
 
-  ASSERT_TRUE(completed_listener.WaitUntilSatisfied());
+  // Create panel window.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("createPanelWindow");
+  ready_listener.Reset();
+  // Default app icon + extension icon updates.
+  test_observer.WaitForIconUpdates(2);
 
-  // Now wait until the WebContent has decoded the icons and chrome has
-  // processed it. This needs to be in a loop since the renderer runs in a
-  // different process.
-  while (test_observer.icon_updates() < 4) {
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
+  // Set panel window icon.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("setPanelWindowIcon");
+  ready_listener.Reset();
+  // Custom icon update.
+  test_observer.WaitForIconUpdate();
+
+  // Create non-shelf window.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("createNonShelfWindow");
+  ready_listener.Reset();
+  // Default app icon + extension icon updates.
+  test_observer.WaitForIconUpdates(2);
+
+  // Create shelf window.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("createShelfWindow");
+  ready_listener.Reset();
+  // Default app icon + extension icon updates.
+  test_observer.WaitForIconUpdates(2);
+
+  // Set shelf window icon.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("setShelfWindowIcon");
+  ready_listener.Reset();
+  // Custom icon update.
+  test_observer.WaitForIconUpdate();
 
   // This test creates one app window, one app window with custom icon and one
   // panel window.
   int shelf_item_count = shelf_model()->item_count();
   ASSERT_EQ(base_shelf_item_count + 3, shelf_item_count);
   // The Panel will be the last item, the app second-to-last.
   const ash::ShelfItem& app_item = shelf_model()->items()[shelf_item_count - 3];
   const ash::ShelfItem& app_custom_icon_item =
       shelf_model()->items()[shelf_item_count - 2];
   const ash::ShelfItem& panel_item =
       shelf_model()->items()[shelf_item_count - 1];
 
   // Icons for Apps are set by the AppWindowLauncherController, so
   // image_set_by_controller() should be set.
   const ash::ShelfItemDelegate* app_item_delegate =
       GetShelfItemDelegate(app_item.id);
   ASSERT_TRUE(app_item_delegate);
-  EXPECT_FALSE(app_item_delegate->image_set_by_controller());
+  EXPECT_TRUE(app_item_delegate->image_set_by_controller());
 
   const ash::ShelfItemDelegate* app_custom_icon_item_delegate =
       GetShelfItemDelegate(app_custom_icon_item.id);
   ASSERT_TRUE(app_custom_icon_item_delegate);
   EXPECT_TRUE(app_custom_icon_item_delegate->image_set_by_controller());
 
   // Ensure icon heights are correct (see test.js in app_icon/ test directory)
+#if defined(USE_ASH)
+  EXPECT_EQ(ash::kShelfSize, app_item.image.height());
+#else
   EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALL, app_item.image.height());
+#endif
   EXPECT_EQ(extension_misc::EXTENSION_ICON_LARGE,
             app_custom_icon_item.image.height());
   EXPECT_EQ(64, panel_item.image.height());
+
+  // No more icon updates.
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(8, test_observer.icon_updates());
+
+  // Exit.
+  ready_listener.WaitUntilSatisfied();
+  ready_listener.Reply("exit");
+  ready_listener.Reset();
 }
 
 // Test that we can launch an app with a shortcut.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, LaunchPinned) {
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   ash::ShelfID shortcut_id = CreateShortcut("app1");
   EXPECT_EQ(ash::STATUS_CLOSED, (*model_->ItemByID(shortcut_id)).status);
   Shelf::ActivateShelfItem(model_->ItemIndexByID(shortcut_id));
   EXPECT_EQ(++tab_count, tab_strip->count());
@@ skipping 1587 matching lines @@
 
 // Chrome's ShelfModel should have AppList and browser items and delegates.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ShelfModelInitialization) {
   ash::ShelfModel* model = controller_->shelf_model();
   EXPECT_EQ(2, model->item_count());
   EXPECT_EQ(ash::kAppListId, model->items()[0].id.app_id);
   EXPECT_TRUE(model->GetShelfItemDelegate(model->items()[0].id));
   EXPECT_EQ(extension_misc::kChromeAppId, model->items()[1].id.app_id);
   EXPECT_TRUE(model->GetShelfItemDelegate(model->items()[1].id));
 }