mash: Replace int ShelfIDs with AppLaunchID strings.

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/public/cpp/shelf_item_delegate.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
@@ skipping 290 matching lines @@
   // Install app to remember existing apps.
   StartInstance();
   InstallTestApps(kTestAppPackage, false);
   SendPackageAdded(kTestAppPackage, false);
 
   const std::string app_id = GetTestApp1Id(kTestAppPackage);
   ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();
   if (is_pinned()) {
     shelf_model->PinAppWithID(app_id);
     const ash::ShelfID shelf_id = shelf_model->GetShelfIDForAppID(app_id);
-    EXPECT_TRUE(shelf_id);
+    EXPECT_FALSE(shelf_id.IsEmpty());
     const ash::ShelfItem* item = chrome_controller()->GetItem(shelf_id);
     EXPECT_EQ(base::UTF8ToUTF16(kTestAppName), item->title);
   } else {
-    EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id));
+    EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id).IsEmpty());
   }
 
   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_model->GetShelfIDForAppID(app_id));
-  else
-    EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id));
+  EXPECT_NE(is_pinned(), shelf_model->GetShelfIDForAppID(app_id).IsEmpty());
 
   // Launching non-ready ARC app creates item on shelf and spinning animation.
   arc::LaunchApp(profile(), app_id, ui::EF_LEFT_MOUSE_BUTTON);
   const ash::ShelfID shelf_id = shelf_model->GetShelfIDForAppID(app_id);
-  EXPECT_TRUE(shelf_id);
+  EXPECT_FALSE(shelf_id.IsEmpty());
   const ash::ShelfItem* item = chrome_controller()->GetItem(shelf_id);
   EXPECT_EQ(base::UTF8ToUTF16(kTestAppName), item->title);
   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(kTestAppPackage, false);
       SendPackageAdded(kTestAppPackage, false);
       EXPECT_TRUE(chrome_controller()
                       ->GetArcDeferredLauncher()
                       ->GetActiveTime(app_id)
                       .is_zero());
-      if (is_pinned())
-        EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id));
-      else
-        EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id));
+      EXPECT_NE(is_pinned(), shelf_model->GetShelfIDForAppID(app_id).IsEmpty());
       break;
     case TEST_ACTION_EXIT:
       // Just exist Chrome.
       break;
     case TEST_ACTION_CLOSE:
       // Close item during animation.
-      {
-        ash::ShelfItemDelegate* delegate = GetShelfItemDelegate(app_id);
-        ASSERT_TRUE(delegate);
-        delegate->Close();
-        EXPECT_TRUE(chrome_controller()
-                        ->GetArcDeferredLauncher()
-                        ->GetActiveTime(app_id)
-                        .is_zero());
-        if (is_pinned())
-          EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id));
-        else
-          EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id));
-      }
+      ash::ShelfItemDelegate* delegate = GetShelfItemDelegate(app_id);

[James Cook, 2017/05/04 16:38:49]

Huh, I'm surprised this compiles, since there's no {} scope for the case.
Something new in C++11?

[msw, 2017/05/04 19:05:57]

Why do you think the brackets are needed?

[James Cook, 2017/05/04 19:45:08]

Because you're declaring a new variable but not adding a new scope. I think this
only works because there is no trailing case label. Otherwise I think you'll get
something like:

foo.cc: In function ‘int main()’:
foo.cc:13:10: error: jump to case label [-fpermissive]
     case 3:
          ^
foo.cc:10:11: error:   crosses initialization of ‘int b’
       int b = 3;

I would add braces.

[msw, 2017/05/04 20:39:07]

Done.

+      ASSERT_TRUE(delegate);
+      delegate->Close();
+      EXPECT_TRUE(chrome_controller()
+                      ->GetArcDeferredLauncher()
+                      ->GetActiveTime(app_id)
+                      .is_zero());
+      EXPECT_NE(is_pinned(), shelf_model->GetShelfIDForAppID(app_id).IsEmpty());
       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) {
   StartInstance();
 
   // Make use app list sync service is started. Normally it is started when
   // sycing is initialized.
   app_list::AppListSyncableServiceFactory::GetForProfile(profile())->GetModel();
 
   InstallTestApps(kTestAppPackage, true);
   SendPackageAdded(kTestAppPackage, false);
 
   const std::string app_id1 = GetTestApp1Id(kTestAppPackage);
   const std::string app_id2 = GetTestApp2Id(kTestAppPackage);
   ash::ShelfModel* shelf_model = ash::Shell::Get()->shelf_model();
   shelf_model->PinAppWithID(app_id1);
   shelf_model->PinAppWithID(app_id2);
   const ash::ShelfID shelf_id1_before =
       shelf_model->GetShelfIDForAppID(app_id1);
-  EXPECT_TRUE(shelf_id1_before);
-  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2));
+  EXPECT_FALSE(shelf_id1_before.IsEmpty());
+  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id2).IsEmpty());
 
   // Package contains only one app. App list is not shown for updated package.
   SendPackageUpdated(kTestAppPackage, false);
   // Second pin should gone.
   EXPECT_EQ(shelf_id1_before, shelf_model->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id2));
+  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsEmpty());
 
   // Package contains two apps. App list is not shown for updated package.
   SendPackageUpdated(kTestAppPackage, true);
   // Second pin should not appear.
   EXPECT_EQ(shelf_id1_before, shelf_model->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id2));
+  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsEmpty());
 
   // Package removed.
   SendPackageRemoved(kTestAppPackage);
   // No pin is expected.
-  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id1));
-  EXPECT_FALSE(shelf_model->GetShelfIDForAppID(app_id2));
+  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id1).IsEmpty());
+  EXPECT_TRUE(shelf_model->GetShelfIDForAppID(app_id2).IsEmpty());
 }
 
 // This test validates that app list is shown on new package and not shown
 // on package update.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, AppListShown) {
   StartInstance();
   AppListService* app_list_service = AppListService::Get();
   ASSERT_TRUE(app_list_service);
 
   EXPECT_FALSE(app_list_service->IsAppListVisible());
@@ skipping 112 matching lines @@
   app_host()->OnTaskDestroyed(2);
   EXPECT_EQ(delegate2, GetShelfItemDelegate(shelf_id2));
   // Destroy task #2, this kills shelf group 2
   app_host()->OnTaskDestroyed(3);
   EXPECT_FALSE(GetShelfItemDelegate(shelf_id2));
 
   // Disable ARC, this removes app and as result kills shelf group 3.
   arc::SetArcPlayStoreEnabledForProfile(profile(), false);
   EXPECT_FALSE(GetShelfItemDelegate(shelf_id3));
 }