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

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index 4af3bfbee8d138e82ac395ab4d235814999cf608..a43aa704241ffb5aeb215ebe9be0a26e4427584b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -2227,8 +2227,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, OverflowBubble) {
 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);
 
@@ -2299,7 +2299,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, TabbedHostedAndBookmarkApps) {
   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(
@@ -2308,7 +2308,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, TabbedHostedAndBookmarkApps) {
   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);
@@ -2344,7 +2344,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, WindowedHostedAndBookmarkApps) {
   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(
@@ -2353,7 +2353,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, WindowedHostedAndBookmarkApps) {
   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(),