[Merge M58] arc: Restore Chrome badging for apps that have peer in Android apps.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_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_impl.h"
 
 #include <stddef.h>
 
 #include "ash/common/shelf/app_list_button.h"
 #include "ash/common/shelf/shelf_button.h"
@@ skipping 841 matching lines @@
 IN_PROC_BROWSER_TEST_F(LauncherPlatformAppBrowserTest, SetIcon) {
   TestAppWindowRegistryObserver 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);
   LoadAndLaunchPlatformApp("app_icon", "Launched");
+
   ASSERT_TRUE(completed_listener.WaitUntilSatisfied());
 
   // 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() < 3) {
+  while (test_observer.icon_updates() < 4) {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
 
-  // This test creates one app window and one panel window.
+  // 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 + 2, shelf_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 =
+  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 LauncherItemController* app_item_controller =
+  const LauncherItemController* app_item_delegate =
       GetItemController(app_item.id);
-  EXPECT_TRUE(app_item_controller->image_set_by_controller());
+  ASSERT_TRUE(app_item_delegate);
+  EXPECT_FALSE(app_item_delegate->image_set_by_controller());
+
+  const LauncherItemController* app_custom_icon_item_delegate =
+      GetItemController(app_custom_icon_item.id);
+  ASSERT_TRUE(app_custom_icon_item_delegate);
+  EXPECT_TRUE(app_custom_icon_item_delegate->image_set_by_controller());
+
   // Panels are handled by ShelfWindowWatcher, not ChromeLauncherController.
   EXPECT_EQ(nullptr, GetItemController(panel_item.id));
   // Ensure icon heights are correct (see test.js in app_icon/ test directory)
-  EXPECT_EQ(ash::GetShelfConstant(ash::SHELF_SIZE), app_item.image.height());
+  EXPECT_EQ(extension_misc::EXTENSION_ICON_SMALL, app_item.image.height());
+  EXPECT_EQ(extension_misc::EXTENSION_ICON_LARGE,
+            app_custom_icon_item.image.height());
   EXPECT_EQ(64, panel_item.image.height());
 }
 
 // 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);
   WmShelf::ActivateShelfItem(model_->ItemIndexByID(shortcut_id));
@@ skipping 1493 matching lines @@
 
   // Close all windows via the menu item.
   CloseBrowserWindow(browser(), menu1.get(), LauncherContextMenu::MENU_CLOSE);
   EXPECT_EQ(0u, BrowserList::GetInstance()->size());
 
   // Check if "Close" is removed from the context menu.
   std::unique_ptr<LauncherContextMenu> menu2 = CreateBrowserItemContextMenu();
   ASSERT_FALSE(
       IsItemPresentInMenu(menu2.get(), LauncherContextMenu::MENU_CLOSE));
 }