Enhance chrome.app.window API for shelf integration with pinning support

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index 40eb059bb5c494c2ecdd7b21d8df17c931373500..527c4bc6bc1b70919dff53709e1a55a5c7a26341 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -3155,7 +3155,7 @@ TEST_F(ChromeLauncherControllerImplTest, AppPanels) {
   // Test adding an app panel
   AppWindowLauncherItemController* app_panel_controller =
       new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP_PANEL, "id", app_id,
+          LauncherItemController::TYPE_APP_PANEL, app_id, "id",
           launcher_controller_.get());
   ash::ShelfID shelf_id1 = launcher_controller_->CreateAppLauncherItem(
       app_panel_controller, app_id, ash::STATUS_RUNNING);
@@ -3179,7 +3179,7 @@ TEST_F(ChromeLauncherControllerImplTest, AppPanels) {
   // one had, being added to the left of the existing panel.
   AppWindowLauncherItemController* app_panel_controller2 =
       new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP_PANEL, "id", app_id,
+          LauncherItemController::TYPE_APP_PANEL, app_id, "id",
           launcher_controller_.get());
 
   ash::ShelfID shelf_id2 = launcher_controller_->CreateAppLauncherItem(
@@ -3374,7 +3374,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
 
   AppWindowLauncherItemController* app_panel_controller3 =
       new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP_PANEL, "id", app_id3,
+          LauncherItemController::TYPE_APP_PANEL, app_id3, "id",
           launcher_controller_.get());
   const ash::ShelfID shelfId3 = launcher_controller_->CreateAppLauncherItem(
       app_panel_controller3, app_id3, ash::STATUS_RUNNING);
@@ -3385,7 +3385,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
 
   AppWindowLauncherItemController* app_panel_controller2 =
       new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP_PANEL, "id", app_id2,
+          LauncherItemController::TYPE_APP_PANEL, app_id2, "id",
           launcher_controller_.get());
   const ash::ShelfID shelfId2 = launcher_controller_->CreateAppLauncherItem(
       app_panel_controller2, app_id2, ash::STATUS_RUNNING);
@@ -3397,7 +3397,7 @@ TEST_F(ChromeLauncherControllerImplTest, MultipleAppIconLoaders) {
   // Test adding an app panel
   AppWindowLauncherItemController* app_panel_controller1 =
       new ExtensionAppWindowLauncherItemController(
-          LauncherItemController::TYPE_APP_PANEL, "id", app_id1,
+          LauncherItemController::TYPE_APP_PANEL, app_id1, "id",
           launcher_controller_.get());
 
   const ash::ShelfID shelfId1 = launcher_controller_->CreateAppLauncherItem(