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

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

 // Copyright 2016 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 "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 206 matching lines @@
 };
 
 // This tests simulates normal workflow for starting Arc app in deferred mode.
 IN_PROC_BROWSER_TEST_P(ArcAppDeferredLauncherBrowserTest, StartAppDeferred) {
   // Install app to remember existing apps.
   InstallTestApps(false);
 
   const std::string app_id = GetTestApp1Id();
   if (is_pinned()) {
     shelf_delegate()->PinAppWithID(app_id);
-    EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+    EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
   } else {
-    EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
+    EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
   }
 
   StopInstance();
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info =
       app_prefs()->GetApp(app_id);
   EXPECT_FALSE(app_info);
 
   // Restart instance. App should be taken from prefs but its state is non-ready
   // currently.
   StartInstance();
   app_info = app_prefs()->GetApp(app_id);
   ASSERT_TRUE(app_info);
   EXPECT_FALSE(app_info->ready);
   if (is_pinned())
-    EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+    EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
   else
-    EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
+    EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
 
   // Launching non-ready Arc app creates item on shelf and spinning animation.
   arc::LaunchApp(profile(), app_id);
-  EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+  EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
   AppAnimatedWaiter(app_id).Wait();
 
   switch (test_action()) {
     case TEST_ACTION_START:
       // Now simulates that Arc is started and app list is refreshed. This
       // should stop animation and delete icon from the shelf.
       InstallTestApps(false);
       EXPECT_TRUE(chrome_controller()
                       ->GetArcDeferredLauncher()
                       ->GetActiveTime(app_id)
                       .is_zero());
       if (is_pinned())
-        EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+        EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
       else
-        EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
+        EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
       break;
     case TEST_ACTION_EXIT:
       // Just exist Chrome.
       break;
     case TEST_ACTION_CLOSE:
       // Close item during animation.
       {
         LauncherItemController* controller =
             chrome_controller()->GetLauncherItemController(
-                shelf_delegate()->GetShelfIDForAppID(app_id));
+                shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
         ASSERT_TRUE(controller);
         controller->Close();
         EXPECT_TRUE(chrome_controller()
                         ->GetArcDeferredLauncher()
                         ->GetActiveTime(app_id)
                         .is_zero());
         if (is_pinned())
-          EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id));
+          EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
         else
-          EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id));
+          EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id, app_id));
       }
       break;
   }
 }
 
 INSTANTIATE_TEST_CASE_P(ArcAppDeferredLauncherBrowserTestInstance,
                         ArcAppDeferredLauncherBrowserTest,
                         ::testing::ValuesIn(build_test_parameter));
 
 // This tests validates pin state on package update and remove.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, PinOnPackageUpdateAndRemove) {
   InstallTestApps(true);
 
   const std::string app_id1 = GetTestApp1Id();
   const std::string app_id2 = GetTestApp2Id();
   shelf_delegate()->PinAppWithID(app_id1);
   shelf_delegate()->PinAppWithID(app_id2);
   const ash::ShelfID shelf_id1_before =
-      shelf_delegate()->GetShelfIDForAppID(app_id1);
+      shelf_delegate()->GetShelfIDForAppID(app_id1, app_id1);
   EXPECT_TRUE(shelf_id1_before);
-  EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id2));
+  EXPECT_TRUE(shelf_delegate()->GetShelfIDForAppID(app_id2, app_id2));
 
   // Package contains only one app.
   SendPackageUpdated(false);
   // Second pin should gone.
-  EXPECT_EQ(shelf_id1_before, shelf_delegate()->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2));
+  EXPECT_EQ(shelf_id1_before,
+            shelf_delegate()->GetShelfIDForAppID(app_id1, app_id1));
+  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2, app_id2));
 
   // Package contains two apps.
   SendPackageUpdated(true);
   // Second pin should not appear.
-  EXPECT_EQ(shelf_id1_before, shelf_delegate()->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2));
+  EXPECT_EQ(shelf_id1_before,
+            shelf_delegate()->GetShelfIDForAppID(app_id1, app_id1));
+  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2, app_id2));
 
   // Package removed.
   SendPackageRemoved();
   // No pin is expected.
-  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2));
+  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id1, app_id1));
+  EXPECT_FALSE(shelf_delegate()->GetShelfIDForAppID(app_id2, app_id2));
 }