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

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/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
@@ skipping 2209 matching lines @@
 
   test.RunMessageLoopUntilAnimationsDone();
   EXPECT_FALSE(shelf_->IsShowingOverflowBubble());
 }
 
 // Check that a windowed V1 application can navigate away from its domain, but
 // still gets detected properly.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, V1AppNavigation) {
   // We assume that the web store is always there (which it apparently is).
   controller_->PinAppWithID(extensions::kWebStoreAppId);
-  ash::ShelfID id = controller_->GetShelfIDForAppID(
-      extensions::kWebStoreAppId);
+  ash::ShelfID id = controller_->GetShelfIDForAppID(extensions::kWebStoreAppId,
+                                                    extensions::kWebStoreAppId);
   ASSERT_NE(0, id);
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(id)->status);
 
   // Create a windowed application.
   AppLaunchParams params = CreateAppLaunchParamsUserContainer(
       profile(), GetExtensionForAppID(extensions::kWebStoreAppId, profile()),
       NEW_FOREGROUND_TAB, extensions::SOURCE_TEST);
   params.container = extensions::LAUNCH_CONTAINER_WINDOW;
   OpenApplication(params);
   EXPECT_EQ(ash::STATUS_ACTIVE, model_->ItemByID(id)->status);
@@ skipping 50 matching lines @@
 }
 
 // Check that tabbed hosted and bookmark apps have correct shelf presence.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, TabbedHostedAndBookmarkApps) {
   // Load and pin a hosted app.
   const Extension* hosted_app =
       LoadExtension(test_data_dir_.AppendASCII("app1/"));
   ASSERT_TRUE(hosted_app);
   controller_->PinAppWithID(hosted_app->id());
   const ash::ShelfID hosted_app_shelf_id =
-      controller_->GetShelfIDForAppID(hosted_app->id());
+      controller_->GetShelfIDForAppID(hosted_app->id(), hosted_app->id());
 
   // Load and pin a bookmark app.
   const Extension* bookmark_app = InstallExtensionWithSourceAndFlags(
       test_data_dir_.AppendASCII("app2/"), 1, extensions::Manifest::INTERNAL,
       extensions::Extension::FROM_BOOKMARK);
   ASSERT_TRUE(bookmark_app);
   controller_->PinAppWithID(bookmark_app->id());
   const ash::ShelfID bookmark_app_shelf_id =
-      controller_->GetShelfIDForAppID(bookmark_app->id());
+      controller_->GetShelfIDForAppID(bookmark_app->id(), bookmark_app->id());
 
   // The apps should be closed.
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_CLOSED,
             model_->ItemByID(bookmark_app_shelf_id)->status);
 
   // Navigate to the app's launch URLs in two tabs.
   ui_test_utils::NavigateToURL(
       browser(), extensions::AppLaunchInfo::GetLaunchWebURL(hosted_app));
   ui_test_utils::NavigateToURLWithDisposition(
@@ skipping 15 matching lines @@
 }
 
 // Check that windowed hosted and bookmark apps have correct shelf presence.
 IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, WindowedHostedAndBookmarkApps) {
   // Load and pin a hosted app.
   const Extension* hosted_app =
       LoadExtension(test_data_dir_.AppendASCII("app1/"));
   ASSERT_TRUE(hosted_app);
   controller_->PinAppWithID(hosted_app->id());
   const ash::ShelfID hosted_app_shelf_id =
-      controller_->GetShelfIDForAppID(hosted_app->id());
+      controller_->GetShelfIDForAppID(hosted_app->id(), hosted_app->id());
 
   // Load and pin a bookmark app.
   const Extension* bookmark_app = InstallExtensionWithSourceAndFlags(
       test_data_dir_.AppendASCII("app2/"), 1, extensions::Manifest::INTERNAL,
       extensions::Extension::FROM_BOOKMARK);
   ASSERT_TRUE(bookmark_app);
   controller_->PinAppWithID(bookmark_app->id());
   const ash::ShelfID bookmark_app_shelf_id =
-      controller_->GetShelfIDForAppID(bookmark_app->id());
+      controller_->GetShelfIDForAppID(bookmark_app->id(), bookmark_app->id());
 
   // Set both apps to open in windows.
   extensions::SetLaunchType(browser()->profile(), hosted_app->id(),
                             extensions::LAUNCH_TYPE_WINDOW);
   extensions::SetLaunchType(browser()->profile(), bookmark_app->id(),
                             extensions::LAUNCH_TYPE_WINDOW);
 
   // The apps should be closed.
   EXPECT_EQ(ash::STATUS_CLOSED, model_->ItemByID(hosted_app_shelf_id)->status);
   EXPECT_EQ(ash::STATUS_CLOSED,
@@ skipping 36 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));
 }