[Merge M59] arg: Fix removing shortcuts on package update.

chrome/browser/ui/app_list/arc/arc_app_unittest.cc

 // Copyright 2015 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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
 #include <memory>
@@ skipping 365 matching lines @@
   // Removes icon request record and allowd re-sending icon request.
   void MaybeRemoveIconRequestRecord(const std::string& app_id) {
     ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
     ASSERT_NE(nullptr, prefs);
 
     prefs->MaybeRemoveIconRequestRecord(app_id);
   }
 
   void AddPackage(const arc::mojom::ArcPackageInfo& package) {
     arc_test_.AddPackage(package);
+    app_instance()->SendPackageAdded(package);
   }
 
   void RemovePackage(const arc::mojom::ArcPackageInfo& package) {
     arc_test_.RemovePackage(package);
+    app_instance()->SendPackageUninstalled(package.package_name);
   }
 
   AppListControllerDelegate* controller() { return controller_.get(); }
 
   TestingProfile* profile() { return profile_.get(); }
 
   ArcAppTest* arc_test() { return &arc_test_; }
 
   const std::vector<arc::mojom::AppInfo>& fake_apps() const {
     return arc_test_.fake_apps();
@@ skipping 150 matching lines @@
   ValidateHavePackages(fake_packages());
 
   arc::mojom::ArcPackageInfo package;
   package.package_name = kTestPackageName;
   package.package_version = 2;
   package.last_backup_android_id = 2;
   package.last_backup_time = 2;
   package.sync = true;
 
   RemovePackage(package);
-  app_instance()->SendPackageUninstalled(package.package_name);
   ValidateHavePackages(fake_packages());
 
   AddPackage(package);
-  app_instance()->SendPackageAdded(package);
   ValidateHavePackages(fake_packages());
 }
 
 TEST_P(ArcAppModelBuilderTest, RefreshAllOnReady) {
   // There should already have been one call, when the interface was
   // registered.
   EXPECT_EQ(1, app_instance()->refresh_app_list_count());
   app_instance()->RefreshAppList();
   EXPECT_EQ(2, app_instance()->refresh_app_list_count());
 }
 
 TEST_P(ArcAppModelBuilderTest, RefreshAllFillsContent) {
   ValidateHaveApps(std::vector<arc::mojom::AppInfo>());
   app_instance()->RefreshAppList();
   app_instance()->SendRefreshAppList(fake_apps());
   ValidateHaveApps(fake_apps());
 }
 
 TEST_P(ArcAppModelBuilderTest, InstallUninstallShortcut) {
   ValidateHaveApps(std::vector<arc::mojom::AppInfo>());
 
   std::vector<arc::mojom::ShortcutInfo> shortcuts = fake_shortcuts();
   ASSERT_GE(shortcuts.size(), 2U);
 
-  // Adding package is requred to safely call SendPackageUninstalled.
+  // Adding package is required to safely call SendPackageUninstalled.
   arc::mojom::ArcPackageInfo package;
   package.package_name = shortcuts[1].package_name;
   package.package_version = 1;
   package.sync = true;
   AddPackage(package);
-  app_instance()->SendPackageAdded(package);
 
   app_instance()->SendInstallShortcuts(shortcuts);
   ValidateHaveShortcuts(shortcuts);
 
   // Uninstall first shortcut and validate it was removed.
   const std::string package_name = shortcuts[0].package_name;
   const std::string intent_uri = shortcuts[0].intent_uri;
   shortcuts.erase(shortcuts.begin());
   app_instance()->SendUninstallShortcut(package_name, intent_uri);
   ValidateHaveShortcuts(shortcuts);
@@ skipping 751 matching lines @@
   const std::string app_id = ArcAppTest::GetAppId(fake_apps()[0]);
 
   EXPECT_FALSE(prefs->IsRegistered(app_id));
   EXPECT_FALSE(FindArcItem(app_id));
   app_instance()->SendTaskCreated(0, fake_apps()[0], std::string());
   // App should not appear now in the model but should be registered.
   EXPECT_FALSE(FindArcItem(app_id));
   EXPECT_TRUE(prefs->IsRegistered(app_id));
 }
 
-TEST_P(ArcAppModelBuilderTest, ArcAppsOnPackageUpdated) {
+TEST_P(ArcAppModelBuilderTest, ArcAppsAndShortcutsOnPackageChange) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   std::vector<arc::mojom::AppInfo> apps = fake_apps();
   ASSERT_GE(3u, apps.size());
   apps[0].package_name = apps[2].package_name;
   apps[1].package_name = apps[2].package_name;
+
+  std::vector<arc::mojom::ShortcutInfo> shortcuts = fake_shortcuts();
+  for (auto& shortcut : shortcuts)
+    shortcut.package_name = apps[0].package_name;
+
   // Second app should be preserved after update.
   std::vector<arc::mojom::AppInfo> apps1(apps.begin(), apps.begin() + 2);
   std::vector<arc::mojom::AppInfo> apps2(apps.begin() + 1, apps.begin() + 3);
 
+  // Adding package is required to safely call SendPackageUninstalled.
+  arc::mojom::ArcPackageInfo package;
+  package.package_name = apps[0].package_name;
+  package.package_version = 1;
+  package.sync = true;
+  AddPackage(package);
+
   app_instance()->RefreshAppList();
   app_instance()->SendRefreshAppList(apps1);
-  ValidateHaveApps(apps1);
+  app_instance()->SendInstallShortcuts(shortcuts);
+
+  ValidateHaveAppsAndShortcuts(apps1, shortcuts);
 
   const std::string app_id = ArcAppTest::GetAppId(apps[1]);
   const base::Time now_time = base::Time::Now();
   prefs->SetLastLaunchTime(app_id, now_time);
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info_before =
       prefs->GetApp(app_id);
   ASSERT_TRUE(app_info_before);
   EXPECT_EQ(now_time, app_info_before->last_launch_time);
 
   app_instance()->SendPackageAppListRefreshed(apps[0].package_name, apps2);
-  ValidateHaveApps(apps2);
+  ValidateHaveAppsAndShortcuts(apps2, shortcuts);
 
   std::unique_ptr<ArcAppListPrefs::AppInfo> app_info_after =
       prefs->GetApp(app_id);
   ASSERT_TRUE(app_info_after);
   EXPECT_EQ(now_time, app_info_after->last_launch_time);
+
+  RemovePackage(package);
+  ValidateHaveAppsAndShortcuts(std::vector<arc::mojom::AppInfo>(),
+                               std::vector<arc::mojom::ShortcutInfo>());
 }
 
 TEST_P(ArcDefaulAppTest, DefaultApps) {
   ArcAppListPrefs* prefs = ArcAppListPrefs::Get(profile_.get());
   ASSERT_NE(nullptr, prefs);
 
   ValidateHaveApps(fake_default_apps());
 
   // Start normal apps. We should have apps from 2 subsets.
   app_instance()->RefreshAppList();
@@ skipping 195 matching lines @@
                         ::testing::ValuesIn(kUnmanagedArcStates));
 INSTANTIATE_TEST_CASE_P(,
                         ArcDefaulAppForManagedUserTest,
                         ::testing::ValuesIn(kManagedArcStates));
 INSTANTIATE_TEST_CASE_P(,
                         ArcPlayStoreAppTest,
                         ::testing::ValuesIn(kUnmanagedArcStates));
 INSTANTIATE_TEST_CASE_P(,
                         ArcAppModelBuilderRecreate,
                         ::testing::ValuesIn(kUnmanagedArcStates));