DPWA: allow callback to be passed to OsIntegrationManager::UninstallOsHooks

This allows caller for OsIntegrationManager::UninstallOsHooks to pass
callback to check the result of the uninstallation of all OS hooks.

Bug: 1108109
Change-Id: I87c3369f9264bdd2cbc4014fd7dc45baef493cdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2329948
Commit-Queue: Phillis Tang <phillis@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Daniel Murphy <dmurph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794759}

chrome/browser/web_applications/components/web_app_run_on_os_login.cc

@@ -27,7 +27,6 @@ void RegisterRunOnOsLoginAndPostCallback(RegisterRunOnOsLoginCallback callback,
       FROM_HERE,
       base::BindOnce(std::move(callback), run_on_os_login_registered));
 }
-
 }  // namespace
 
 namespace internals {
@@ -41,8 +40,10 @@ bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info) {
 
 // TODO(crbug.com/897302): This boilerplate function is used for platforms
 // other than Windows, currently the feature is only supported in Windows.
-void UnregisterRunOnOsLogin(const base::FilePath& profile_path,
-                            const base::string16& shortcut_title) {}
+bool UnregisterRunOnOsLogin(const base::FilePath& profile_path,
+                            const base::string16& shortcut_title) {
+  return true;
+}
 #endif
 
 }  // namespace internals
@@ -56,4 +57,16 @@ void ScheduleRegisterRunOnOsLogin(std::unique_ptr<ShortcutInfo> shortcut_info,
       std::move(shortcut_info));
 }
 
+void ScheduleUnregisterRunOnOsLogin(const base::FilePath& profile_path,
+                                    const base::string16& shortcut_title,
+                                    UnregisterRunOnOsLoginCallback callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  internals::GetShortcutIOTaskRunner()->PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::BindOnce(&internals::UnregisterRunOnOsLogin, profile_path,
+                     shortcut_title),
+      std::move(callback));
+}
+
 }  // namespace web_app

chrome/browser/web_applications/components/web_app_run_on_os_login.h

@@ -25,6 +25,10 @@ struct ShortcutInfo;
 // registered.
 using RegisterRunOnOsLoginCallback = base::OnceCallback<void(bool success)>;
 
+// Callback made when UnregisterRunOnOslogin has finished indicating whether or
+// not it was successfully unregistered
+using UnregisterRunOnOsLoginCallback = base::OnceCallback<void(bool success)>;
+
 namespace internals {
 
 // Registers the app with the OS to run on OS login. Platform specific
@@ -35,7 +39,7 @@ bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info);
 // Unregisters the app with the OS from running on startup. Platform specific
 // implementations are required for this.
 // See web_app_shortcut_win.cc for Windows.
-void UnregisterRunOnOsLogin(const base::FilePath& profile_path,
+bool UnregisterRunOnOsLogin(const base::FilePath& profile_path,
                             const base::string16& shortcut_title);
 
 }  // namespace internals
@@ -46,6 +50,9 @@ void UnregisterRunOnOsLogin(const base::FilePath& profile_path,
 void ScheduleRegisterRunOnOsLogin(std::unique_ptr<ShortcutInfo> shortcut_info,
                                   RegisterRunOnOsLoginCallback callback);
 
+void ScheduleUnregisterRunOnOsLogin(const base::FilePath& profile_path,
+                                    const base::string16& shortcut_title,
+                                    UnregisterRunOnOsLoginCallback callback);
 }  // namespace web_app
 
 #endif  // CHROME_BROWSER_WEB_APPLICATIONS_COMPONENTS_WEB_APP_RUN_ON_OS_LOGIN_H_

chrome/browser/web_applications/components/web_app_run_on_os_login_win.cc

@@ -24,22 +24,24 @@ bool RegisterRunOnOsLogin(const ShortcutInfo& shortcut_info) {
                                  SHORTCUT_CREATION_BY_USER, shortcut_info);
 }
 
-void UnregisterRunOnOsLogin(const base::FilePath& profile_path,
+bool UnregisterRunOnOsLogin(const base::FilePath& profile_path,
                             const base::string16& shortcut_title) {
   web_app::ShortcutLocations all_shortcut_locations;
   all_shortcut_locations.in_startup = true;
   std::vector<base::FilePath> all_paths =
       GetShortcutPaths(all_shortcut_locations);
-
+  bool result = true;
   // Only Startup folder is the expected path to be returned in all_paths.
   for (const auto& path : all_paths) {
     // Find all app's shortcuts in Startup folder to delete.
     std::vector<base::FilePath> shortcut_files =
         FindAppShortcutsByProfileAndTitle(path, profile_path, shortcut_title);
     for (const auto& shortcut_file : shortcut_files) {
-      base::DeleteFile(shortcut_file);
+      if (!base::DeleteFile(shortcut_file))
+        result = false;
     }
   }
+  return result;
 }
 
 }  // namespace internals

chrome/browser/web_applications/components/web_app_shortcut.cc

@@ -71,6 +71,16 @@ void CreatePlatformShortcutsAndPostCallback(
       FROM_HERE, base::BindOnce(std::move(callback), shortcut_created));
 }
 
+void DeletePlatformShortcutsAndPostCallback(
+    const base::FilePath& shortcut_data_path,
+    CreateShortcutsCallback callback,
+    const ShortcutInfo& shortcut_info) {
+  bool shortcut_deleted =
+      internals::DeletePlatformShortcuts(shortcut_data_path, shortcut_info);
+  content::GetUIThreadTaskRunner({})->PostTask(
+      FROM_HERE, base::BindOnce(std::move(callback), shortcut_deleted));
+}
+
 }  // namespace
 
 ShortcutInfo::ShortcutInfo() = default;
@@ -166,6 +176,17 @@ void ScheduleCreatePlatformShortcuts(
                      std::move(shortcut_info));
 }
 
+void ScheduleDeletePlatformShortcuts(
+    const base::FilePath& shortcut_data_path,
+    std::unique_ptr<ShortcutInfo> shortcut_info,
+    DeleteShortcutsCallback callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+
+  PostShortcutIOTask(base::BindOnce(&DeletePlatformShortcutsAndPostCallback,
+                                    shortcut_data_path, std::move(callback)),
+                     std::move(shortcut_info));
+}
+
 void PostShortcutIOTaskAndReply(
     base::OnceCallback<void(const ShortcutInfo&)> task,
     std::unique_ptr<ShortcutInfo> shortcut_info,

chrome/browser/web_applications/components/web_app_shortcut.h

@@ -123,6 +123,10 @@ base::FilePath GetOsIntegrationResourcesDirectoryForApp(
 // platform shortcuts indicating whether or not they were successfully
 // created.
 using CreateShortcutsCallback = base::OnceCallback<void(bool shortcut_created)>;
+// Callback made when DeletePlatformShortcuts has finished trying to delete the
+// platform shortcuts indicating whether or not they were successfully
+// deleted.
+using DeleteShortcutsCallback = base::OnceCallback<void(bool shortcut_deleted)>;
 
 // Returns an array of desired icon sizes (in px) to be contained in an app OS
 // shortcut, sorted in ascending order (biggest desired icon size is last).
@@ -155,10 +159,15 @@ void ScheduleCreatePlatformShortcuts(
     std::unique_ptr<ShortcutInfo> shortcut_info,
     CreateShortcutsCallback callback);
 
+void ScheduleDeletePlatformShortcuts(
+    const base::FilePath& shortcut_data_path,
+    std::unique_ptr<ShortcutInfo> shortcut_info,
+    DeleteShortcutsCallback callback);
+
 // Delete all the shortcuts we have added for this extension. This is the
 // platform specific implementation of the DeleteAllShortcuts function, and
 // is executed on the FILE thread.
-void DeletePlatformShortcuts(const base::FilePath& shortcut_data_path,
+bool DeletePlatformShortcuts(const base::FilePath& shortcut_data_path,
                              const ShortcutInfo& shortcut_info);
 
 // Delete the multi-profile (non-profile_scoped) shortcuts for the specified

chrome/browser/web_applications/components/web_app_shortcut_chromeos.cc

@@ -15,8 +15,10 @@ bool CreatePlatformShortcuts(const base::FilePath& web_app_path,
   return true;
 }
 
-void DeletePlatformShortcuts(const base::FilePath& web_app_path,
-                             const ShortcutInfo& shortcut_info) {}
+bool DeletePlatformShortcuts(const base::FilePath& web_app_path,
+                             const ShortcutInfo& shortcut_info) {
+  return true;
+}
 
 void UpdatePlatformShortcuts(const base::FilePath& web_app_path,
                              const base::string16& old_app_title,

chrome/browser/web_applications/components/web_app_shortcut_linux.cc

@@ -281,13 +281,15 @@ base::FilePath GetAppShortcutFilename(const base::FilePath& profile_path,
   return base::FilePath(filename.append(".desktop"));
 }
 
-void DeleteShortcutOnDesktop(const base::FilePath& shortcut_filename) {
+bool DeleteShortcutOnDesktop(const base::FilePath& shortcut_filename) {
   base::FilePath desktop_path;
+  bool result = false;
   if (base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_path))
-    base::DeleteFile(desktop_path.Append(shortcut_filename));
+    result = base::DeleteFile(desktop_path.Append(shortcut_filename));
+  return result;
 }
 
-void DeleteShortcutInApplicationsMenu(
+bool DeleteShortcutInApplicationsMenu(
     const base::FilePath& shortcut_filename,
     const base::FilePath& directory_filename) {
   std::vector<std::string> argv;
@@ -306,7 +308,7 @@ void DeleteShortcutInApplicationsMenu(
     argv.push_back(directory_filename.value());
   argv.push_back(shortcut_filename.value());
   int exit_code;
-  shell_integration_linux::LaunchXdgUtility(argv, &exit_code);
+  return shell_integration_linux::LaunchXdgUtility(argv, &exit_code);
 }
 
 bool CreateDesktopShortcut(const ShortcutInfo& shortcut_info,
@@ -447,7 +449,7 @@ ShortcutLocations GetExistingShortcutLocations(
   return locations;
 }
 
-void DeleteDesktopShortcuts(const base::FilePath& profile_path,
+bool DeleteDesktopShortcuts(const base::FilePath& profile_path,
                             const std::string& extension_id) {
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
@@ -456,21 +458,22 @@ void DeleteDesktopShortcuts(const base::FilePath& profile_path,
       GetAppShortcutFilename(profile_path, extension_id);
   DCHECK(!shortcut_filename.empty());
 
-  DeleteShortcutOnDesktop(shortcut_filename);
+  bool deleted_from_desktop = DeleteShortcutOnDesktop(shortcut_filename);
   // Delete shortcuts from |kDirectoryFilename|.
   // Note that it is possible that shortcuts were not created in the Chrome Apps
   // directory. It doesn't matter: this will still delete the shortcut even if
   // it isn't in the directory.
-  DeleteShortcutInApplicationsMenu(shortcut_filename,
-                                   base::FilePath(kDirectoryFilename));
+  bool deleted_from_application_menu = DeleteShortcutInApplicationsMenu(
+      shortcut_filename, base::FilePath(kDirectoryFilename));
+  return (deleted_from_desktop && deleted_from_application_menu);
 }
 
-void DeleteAllDesktopShortcuts(const base::FilePath& profile_path) {
+bool DeleteAllDesktopShortcuts(const base::FilePath& profile_path) {
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
 
   std::unique_ptr<base::Environment> env(base::Environment::Create());
-
+  bool result = true;
   // Delete shortcuts from Desktop.
   base::FilePath desktop_path;
   if (base::PathService::Get(base::DIR_USER_DESKTOP, &desktop_path)) {
@@ -478,7 +481,8 @@ void DeleteAllDesktopShortcuts(const base::FilePath& profile_path) {
         shell_integration_linux::GetExistingProfileShortcutFilenames(
             profile_path, desktop_path);
     for (const auto& shortcut : shortcut_filenames_desktop) {
-      DeleteShortcutOnDesktop(shortcut);
+      if (!DeleteShortcutOnDesktop(shortcut))
+        result = false;
     }
   }
 
@@ -490,8 +494,12 @@ void DeleteAllDesktopShortcuts(const base::FilePath& profile_path) {
       shell_integration_linux::GetExistingProfileShortcutFilenames(
           profile_path, applications_menu);
   for (const auto& menu : shortcut_filenames_app_menu) {
-    DeleteShortcutInApplicationsMenu(menu, base::FilePath(kDirectoryFilename));
+    if (!DeleteShortcutInApplicationsMenu(menu,
+                                          base::FilePath(kDirectoryFilename))) {
+      result = false;
+    }
   }
+  return result;
 }
 
 namespace internals {
@@ -509,12 +517,13 @@ bool CreatePlatformShortcuts(const base::FilePath& web_app_path,
 #endif
 }
 
-void DeletePlatformShortcuts(const base::FilePath& web_app_path,
+bool DeletePlatformShortcuts(const base::FilePath& web_app_path,
                              const ShortcutInfo& shortcut_info) {
 #if !defined(OS_CHROMEOS)
-  DeleteDesktopShortcuts(shortcut_info.profile_path,
-                         shortcut_info.extension_id);
+  return DeleteDesktopShortcuts(shortcut_info.profile_path,
+                                shortcut_info.extension_id);
 #endif
+  return true;
 }
 
 void UpdatePlatformShortcuts(const base::FilePath& web_app_path,

chrome/browser/web_applications/components/web_app_shortcut_linux.h

@@ -49,13 +49,14 @@ ShortcutLocations GetExistingShortcutLocations(
     const base::FilePath& desktop_path);
 
 // Delete any desktop shortcuts on desktop or in the application menu that have
-// been added for the extension with |extension_id| in |profile_path|.
-void DeleteDesktopShortcuts(const base::FilePath& profile_path,
+// been added for the extension with |extension_id| in |profile_path|. Returns
+// true on successful deletion.
+bool DeleteDesktopShortcuts(const base::FilePath& profile_path,
                             const std::string& extension_id);
 
 // Delete any desktop shortcuts on desktop or in the application menu that have
-// for the profile in |profile_path|.
-void DeleteAllDesktopShortcuts(const base::FilePath& profile_path);
+// for the profile in |profile_path|. Returns true on successful deletion.
+bool DeleteAllDesktopShortcuts(const base::FilePath& profile_path);
 
 }  // namespace web_app
 

chrome/browser/web_applications/components/web_app_shortcut_mac.mm

@@ -1328,15 +1328,19 @@ bool CreatePlatformShortcuts(const base::FilePath& app_data_path,
   return shortcut_creator.CreateShortcuts(creation_reason, creation_locations);
 }
 
-void DeletePlatformShortcuts(const base::FilePath& app_data_path,
+bool DeletePlatformShortcuts(const base::FilePath& app_data_path,
                              const ShortcutInfo& shortcut_info) {
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
                                                 base::BlockingType::MAY_BLOCK);
   const std::string bundle_id = GetBundleIdentifier(shortcut_info.extension_id,
                                                     shortcut_info.profile_path);
   auto bundle_infos = SearchForBundlesById(bundle_id);
-  for (const auto& bundle_info : bundle_infos)
-    base::DeletePathRecursively(bundle_info.bundle_path());
+  bool result = true;
+  for (const auto& bundle_info : bundle_infos) {
+    if (!base::DeletePathRecursively(bundle_info.bundle_path()))
+      result = false;
+  }
+  return result;
 }
 
 void DeleteMultiProfileShortcutsForApp(const std::string& app_id) {

chrome/browser/web_applications/components/web_app_shortcut_win.cc

@@ -229,12 +229,14 @@ bool CreateShortcutsInPaths(const base::FilePath& web_app_path,
 // for this app were found (and deleted). This will delete duplicate shortcuts,
 // but only return each path once, even if it contained multiple deleted
 // shortcuts. Both of these may be NULL.
-void GetShortcutLocationsAndDeleteShortcuts(
+bool GetShortcutLocationsAndDeleteShortcuts(
     const base::FilePath& web_app_path,
     const base::FilePath& profile_path,
     const base::string16& title,
     bool* was_pinned_to_taskbar,
     std::vector<base::FilePath>* shortcut_paths) {
+  bool result = true;
+
   // Get all possible locations for shortcuts.
   web_app::ShortcutLocations all_shortcut_locations;
   all_shortcut_locations.in_quick_launch_bar = true;
@@ -275,9 +277,11 @@ void GetShortcutLocationsAndDeleteShortcuts(
       // Any shortcut could have been pinned, either by chrome or the user, so
       // they are all unpinned.
       base::win::UnpinShortcutFromTaskbar(*j);
-      base::DeleteFile(*j);
+      if (base::DeleteFile(*j))
+        result = false;
     }
   }
+  return result;
 }
 
 void CreateIconAndSetRelaunchDetails(
@@ -472,11 +476,11 @@ void UpdatePlatformShortcuts(const base::FilePath& web_app_path,
   CheckAndSaveIcon(icon_file, shortcut_info.favicon, true);
 }
 
-void DeletePlatformShortcuts(const base::FilePath& web_app_path,
+bool DeletePlatformShortcuts(const base::FilePath& web_app_path,
                              const ShortcutInfo& shortcut_info) {
-  GetShortcutLocationsAndDeleteShortcuts(web_app_path,
-                                         shortcut_info.profile_path,
-                                         shortcut_info.title, NULL, NULL);
+  bool result = GetShortcutLocationsAndDeleteShortcuts(
+      web_app_path, shortcut_info.profile_path, shortcut_info.title, nullptr,
+      nullptr);
 
   // If there are no more shortcuts in the Chrome Apps subdirectory, remove it.
   base::FilePath chrome_apps_dir;
@@ -488,7 +492,9 @@ void DeletePlatformShortcuts(const base::FilePath& web_app_path,
   }
 
   // Delete downloaded shortcut icons for the web app.
-  web_app::internals::DeleteShortcutsMenuIcons(web_app_path);
+  if (!web_app::internals::DeleteShortcutsMenuIcons(web_app_path))
+    result = false;
+  return result;
 }
 
 void DeleteAllShortcutsForProfile(const base::FilePath& profile_path) {

chrome/browser/web_applications/components/web_app_shortcuts_menu.cc

@@ -25,10 +25,12 @@ void RegisterShortcutsMenuWithOs(
   DCHECK(ShouldRegisterShortcutsMenuWithOs());
 }
 
-void UnregisterShortcutsMenuWithOs(const AppId& app_id,
+bool UnregisterShortcutsMenuWithOs(const AppId& app_id,
                                    const base::FilePath& profile_path) {
   NOTIMPLEMENTED();
   DCHECK(ShouldRegisterShortcutsMenuWithOs());
+
+  return true;
 }
 #endif  // !defined(OS_WIN)
 

chrome/browser/web_applications/components/web_app_shortcuts_menu.h

@@ -30,8 +30,8 @@ void RegisterShortcutsMenuWithOs(
     const ShortcutsMenuIconsBitmaps& shortcuts_menu_icons_bitmaps);
 
 // Deletes the ShortcutsMenu from the OS. This should be called during the
-// uninstallation process.
-void UnregisterShortcutsMenuWithOs(const AppId& app_id,
+// uninstallation process. Returns true on successful deletion.
+bool UnregisterShortcutsMenuWithOs(const AppId& app_id,
                                    const base::FilePath& profile_path);
 
 }  // namespace web_app

chrome/browser/web_applications/components/web_app_shortcuts_menu_win.cc

@@ -211,22 +211,23 @@ void RegisterShortcutsMenuWithOs(
                      shortcuts_menu_icons_bitmaps));
 }
 
-void UnregisterShortcutsMenuWithOs(const AppId& app_id,
+bool UnregisterShortcutsMenuWithOs(const AppId& app_id,
                                    const base::FilePath& profile_path) {
   if (!JumpListUpdater::DeleteJumpList(
           GenerateAppUserModelId(profile_path, app_id))) {
     RecordUnregistration(UnregistrationResult::kFailedToDeleteJumpList);
-    return;
+    return false;
   }
   RecordUnregistration(UnregistrationResult::kSuccess);
+  return true;
 }
 
 namespace internals {
 
-void DeleteShortcutsMenuIcons(const base::FilePath& shortcut_data_dir) {
+bool DeleteShortcutsMenuIcons(const base::FilePath& shortcut_data_dir) {
   base::FilePath shortcuts_menu_icons_path =
       GetShortcutsMenuIconsDirectory(shortcut_data_dir);
-  base::DeletePathRecursively(shortcuts_menu_icons_path);
+  return base::DeletePathRecursively(shortcuts_menu_icons_path);
 }
 
 }  // namespace internals

chrome/browser/web_applications/components/web_app_shortcuts_menu_win.h

@@ -13,7 +13,7 @@ namespace internals {
 
 // Deletes all .ico shortcuts menu icons that were written to disk at PWA
 // install time. Call this when PWA is uninstalled on Windows.
-void DeleteShortcutsMenuIcons(const base::FilePath& web_app_path);
+bool DeleteShortcutsMenuIcons(const base::FilePath& web_app_path);
 
 }  // namespace internals
 

chrome/browser/web_applications/extensions/bookmark_app_registrar.cc

@@ -81,7 +81,7 @@ void BookmarkAppRegistrar::OnExtensionUninstalled(
     NotifyWebAppUninstalled(extension->id());
     web_app::WebAppProviderBase::GetProviderBase(profile())
         ->os_integration_manager()
-        .UninstallOsHooks(extension->id());
+        .UninstallOsHooks(extension->id(), base::DoNothing());
 
     bookmark_app_being_observed_ = nullptr;
   }
@@ -104,7 +104,7 @@ void BookmarkAppRegistrar::OnExtensionUnloaded(
     NotifyWebAppProfileWillBeDeleted(extension->id());
     web_app::WebAppProviderBase::GetProviderBase(profile())
         ->os_integration_manager()
-        .UninstallOsHooks(extension->id());
+        .UninstallOsHooks(extension->id(), base::DoNothing());
   }
 
   bookmark_app_being_observed_ = nullptr;

chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc

@@ -268,9 +268,8 @@ void DeleteAllShortcuts(Profile* profile, const extensions::Extension* app) {
       ShortcutInfoForExtensionAndProfile(app, profile));
   base::FilePath shortcut_data_dir =
       internals::GetShortcutDataDir(*shortcut_info);
-  internals::PostShortcutIOTask(
-      base::BindOnce(&internals::DeletePlatformShortcuts, shortcut_data_dir),
-      std::move(shortcut_info));
+  internals::ScheduleDeletePlatformShortcuts(
+      shortcut_data_dir, std::move(shortcut_info), base::DoNothing());
 }
 
 void UpdateAllShortcuts(const base::string16& old_app_title,

chrome/browser/web_applications/os_integration_manager.cc

@@ -30,11 +30,11 @@ class OsHooksBarrierInfo {
   explicit OsHooksBarrierInfo(InstallOsHooksCallback done_callback)
       : done_callback_(std::move(done_callback)) {}
 
-  void Run(OsHookType::Type os_hook, bool created) {
+  void Run(OsHookType::Type os_hook, bool completed) {
     DCHECK(!os_hooks_called_[os_hook]);
 
     os_hooks_called_[os_hook] = true;
-    os_hooks_results_[os_hook] = created;
+    os_hooks_results_[os_hook] = completed;
 
     if (os_hooks_called_.all()) {
       std::move(done_callback_).Run(os_hooks_results_);
@@ -103,7 +103,7 @@ void OsIntegrationManager::InstallOsHooks(
   // callback for every type. Developers should double check that Run is
   // called for every OsHookType::Type. If there is any missing type, the
   // InstallOsHooksCallback will not get run.
-  base::RepeatingCallback<void(OsHookType::Type os_hook, bool created)>
+  base::RepeatingCallback<void(OsHookType::Type os_hook, bool completed)>
       barrier = base::BindRepeating(
           &OsHooksBarrierInfo::Run,
           base::Owned(new OsHooksBarrierInfo(std::move(callback))));
@@ -127,12 +127,24 @@ void OsIntegrationManager::InstallOsHooks(
   }
 }
 
-void OsIntegrationManager::UninstallOsHooks(const AppId& app_id) {
+void OsIntegrationManager::UninstallOsHooks(const AppId& app_id,
+                                            UninstallOsHooksCallback callback) {
+  DCHECK(shortcut_manager_);
+
   if (suppress_os_hooks_for_testing_)
     return;
 
-  if (ShouldRegisterShortcutsMenuWithOs())
-    UnregisterShortcutsMenuWithOs(app_id, profile_->GetPath());
+  base::RepeatingCallback<void(OsHookType::Type os_hook, bool completed)>
+      barrier = base::BindRepeating(
+          &OsHooksBarrierInfo::Run,
+          base::Owned(new OsHooksBarrierInfo(std::move(callback))));
+
+  if (ShouldRegisterShortcutsMenuWithOs()) {
+    barrier.Run(OsHookType::kShortcutsMenu,
+                UnregisterShortcutsMenuWithOs(app_id, profile_->GetPath()));
+  } else {
+    barrier.Run(OsHookType::kShortcutsMenu, /*completed=*/true);
+  }
 
   std::unique_ptr<ShortcutInfo> shortcut_info =
       shortcut_manager_->BuildShortcutInfo(app_id);
@@ -140,17 +152,19 @@ void OsIntegrationManager::UninstallOsHooks(const AppId& app_id) {
       internals::GetShortcutDataDir(*shortcut_info);
 
   if (base::FeatureList::IsEnabled(features::kDesktopPWAsRunOnOsLogin)) {
-    internals::GetShortcutIOTaskRunner()->PostTask(
-        FROM_HERE,
-        base::BindOnce(&internals::UnregisterRunOnOsLogin,
-                       shortcut_info->profile_path, shortcut_info->title));
+    ScheduleUnregisterRunOnOsLogin(
+        shortcut_info->profile_path, shortcut_info->title,
+        base::BindOnce(barrier, OsHookType::kRunOnOsLogin));
   }
 
-  internals::PostShortcutIOTask(
-      base::BindOnce(&internals::DeletePlatformShortcuts, shortcut_data_dir),
-      std::move(shortcut_info));
+  internals::ScheduleDeletePlatformShortcuts(
+      shortcut_data_dir, std::move(shortcut_info),
+      base::BindOnce(barrier, OsHookType::kShortcuts));
 
+  // TODO(https://crbug.com/1108109) we should return the result of file handler
+  // unregistration and record errors during unregistration.
   file_handler_manager_->DisableAndUnregisterOsFileHandlers(app_id);
+  barrier.Run(OsHookType::kFileHandlers, /*completed=*/true);
 
   DeleteSharedAppShims(app_id);
 }
@@ -169,12 +183,12 @@ void OsIntegrationManager::OnShortcutsCreated(
   DCHECK(file_handler_manager_);
   DCHECK(ui_manager_);
 
-  barrier_callback.Run(OsHookType::kShortcuts, true);
+  barrier_callback.Run(OsHookType::kShortcuts, /*completed=*/true);
 
   // TODO(crbug.com/1087219): callback should be run after all hooks are
   // deployed, need to refactor filehandler to allow this.
   file_handler_manager_->EnableAndRegisterOsFileHandlers(app_id);
-  barrier_callback.Run(OsHookType::kFileHandlers, true);
+  barrier_callback.Run(OsHookType::kFileHandlers, /*completed=*/true);
 
   if (options.add_to_quick_launch_bar &&
       ui_manager_->CanAddAppToQuickLaunchBar()) {
@@ -187,13 +201,13 @@ void OsIntegrationManager::OnShortcutsCreated(
           web_app_info->shortcuts_menu_icons_bitmaps);
       // TODO(https://crbug.com/1098471): fix RegisterShortcutsMenuWithOs to
       // take callback.
-      barrier_callback.Run(OsHookType::kShortcutsMenu, true);
+      barrier_callback.Run(OsHookType::kShortcutsMenu, /*completed=*/true);
     } else {
       shortcut_manager_->ReadAllShortcutsMenuIconsAndRegisterShortcutsMenu(
           app_id, base::BindOnce(barrier_callback, OsHookType::kShortcutsMenu));
     }
   } else {
-    barrier_callback.Run(OsHookType::kShortcutsMenu, false);
+    barrier_callback.Run(OsHookType::kShortcutsMenu, /*completed=*/false);
   }
 
   if (base::FeatureList::IsEnabled(features::kDesktopPWAsRunOnOsLogin) &&

chrome/browser/web_applications/os_integration_manager.h

@@ -34,11 +34,14 @@ struct InstallOsHooksOptions {
   bool run_on_os_login = false;
 };
 
-// Callback made when InstallOsHooks has finished trying to deploy all
-// needed OS hooks.
+// Callback made after InstallOsHooks is finished.
 using InstallOsHooksCallback =
     base::OnceCallback<void(OsHooksResults os_hooks_info)>;
 
+// Callback made after UninstallOsHooks is finished.
+using UninstallOsHooksCallback =
+    base::OnceCallback<void(OsHooksResults os_hooks_info)>;
+
 // OsIntegrationManager is responsible of creating/updating/deleting
 // all OS hooks during Web App lifecycle.
 // It contains individual OS integration managers and takes
@@ -67,7 +70,8 @@ class OsIntegrationManager {
   // Uninstall all OS hooks for the web app.
   // TODO(https://crbug.com/1108109) we should record uninstall result and allow
   // callback. virtual for testing
-  virtual void UninstallOsHooks(const AppId& app_id);
+  virtual void UninstallOsHooks(const AppId& app_id,
+                                UninstallOsHooksCallback callback);
 
   void SuppressOsHooksForTesting();
 

chrome/browser/web_applications/test/test_os_integration_manager.cc

@@ -57,7 +57,9 @@ void TestOsIntegrationManager::InstallOsHooks(
       base::BindOnce(std::move(callback), std::move(os_hooks_results)));
 }
 
-void TestOsIntegrationManager::UninstallOsHooks(const AppId& app_id) {
+void TestOsIntegrationManager::UninstallOsHooks(
+    const AppId& app_id,
+    UninstallOsHooksCallback callback) {
   NOTIMPLEMENTED();
 }
 

chrome/browser/web_applications/test/test_os_integration_manager.h

@@ -23,7 +23,8 @@ class TestOsIntegrationManager : public OsIntegrationManager {
                       InstallOsHooksCallback callback,
                       std::unique_ptr<WebApplicationInfo> web_app_info,
                       InstallOsHooksOptions options) override;
-  void UninstallOsHooks(const AppId& app_id) override;
+  void UninstallOsHooks(const AppId& app_id,
+                        UninstallOsHooksCallback callback) override;
 
   size_t num_create_shortcuts_calls() const {
     return num_create_shortcuts_calls_;

chrome/browser/web_applications/web_app_install_finalizer.cc

@@ -384,7 +384,7 @@ void WebAppInstallFinalizer::UninstallWebApp(const AppId& app_id,
   registrar().NotifyWebAppUninstalled(app_id);
   WebAppProviderBase::GetProviderBase(profile_)
       ->os_integration_manager()
-      .UninstallOsHooks(app_id);
+      .UninstallOsHooks(app_id, base::DoNothing());
 
   ScopedRegistryUpdate update(registry_controller().AsWebAppSyncBridge());
   update->DeleteApp(app_id);

chrome/browser/web_applications/web_app_registrar.cc

@@ -191,7 +191,7 @@ void WebAppRegistrar::OnProfileMarkedForPermanentDeletion(
     NotifyWebAppProfileWillBeDeleted(app.app_id());
     WebAppProviderBase::GetProviderBase(profile())
         ->os_integration_manager()
-        .UninstallOsHooks(app.app_id());
+        .UninstallOsHooks(app.app_id(), base::DoNothing());
   }
   // We can't do registry_.clear() here because it makes in-memory registry
   // diverged from the sync server registry and from the on-disk registry

chrome/browser/web_applications/web_app_sync_bridge.cc

@@ -513,7 +513,7 @@ void WebAppSyncBridge::ApplySyncChangesToRegistrar(
     registrar_->NotifyWebAppUninstalled(app_id);
     WebAppProviderBase::GetProviderBase(profile())
         ->os_integration_manager()
-        .UninstallOsHooks(app_id);
+        .UninstallOsHooks(app_id, base::DoNothing());
   }
 
   std::vector<WebApp*> apps_to_install;