WebApp: Rename UninstallWebApp method to UninstallWebAppFromSyncByUser.

This is a preparation CL to implement Uninstall for the new web apps.

A web app can't be fully uninstalled by any call site.
Instead: A call site may request uninstallation, but the app may stay
installed if it is required by other sources.

CanUserUninstallFromSync+UninstallWebAppFromSyncByUser is just one
scenario for uninstallation. UninstallExternalWebApp will be extended.

Bug: 901226
Change-Id: I91f13754c0cc4a2fe80fd2a7b79e340ea9c3b2f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1921019Reviewed-by: Eric Willigers <ericwilligers@chromium.org>
Commit-Queue: Alexey Baskakov <loyso@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716438}

chrome/browser/web_applications/components/install_finalizer.h

@@ -60,10 +60,9 @@ class InstallFinalizer {
   virtual void UninstallExternalWebApp(const GURL& app_url,
                                        UninstallWebAppCallback) = 0;
 
-  // Removes the web app with |app_id| from disk, registrar and all sync'd
-  // devices.
-  virtual void UninstallWebApp(const AppId& app_id,
-                               UninstallWebAppCallback) = 0;
+  virtual bool CanUserUninstallFromSync(const AppId& app_id) const = 0;
+  virtual void UninstallWebAppFromSyncByUser(const AppId& app_id,
+                                             UninstallWebAppCallback) = 0;
 
   // |virtual| for testing.
   virtual bool CanAddAppToQuickLaunchBar() const;
@@ -78,8 +77,6 @@ class InstallFinalizer {
   virtual bool CanRevealAppShim() const = 0;
   virtual void RevealAppShim(const AppId& app_id) = 0;
 
-  virtual bool CanUserUninstallFromSync(const AppId& app_id) const = 0;
-
   void SetSubsystems(AppRegistrar* registrar, WebAppUiManager* ui_manager);
 
   virtual ~InstallFinalizer() = default;

chrome/browser/web_applications/components/manifest_update_manager_browsertest.cc

@@ -295,7 +295,8 @@ IN_PROC_BROWSER_TEST_F(ManifestUpdateManagerBrowserTest,
   GURL url = GetAppURL();
   UpdateCheckResultAwaiter awaiter(browser(), url);
   ui_test_utils::NavigateToURL(browser(), url);
-  GetProvider().install_finalizer().UninstallWebApp(app_id, base::DoNothing());
+  GetProvider().install_finalizer().UninstallWebAppFromSyncByUser(
+      app_id, base::DoNothing());
   EXPECT_EQ(std::move(awaiter).AwaitNextResult(),
             ManifestUpdateResult::kAppUninstalled);
   histogram_tester_.ExpectBucketCount(kUpdateHistogramName,

chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.cc

@@ -159,10 +159,27 @@ void BookmarkAppInstallFinalizer::UninstallExternalWebApp(
     return;
   }
 
-  UninstallWebApp(*app_id, std::move(callback));
+  UninstallExtension(*app_id, std::move(callback));
 }
 
-void BookmarkAppInstallFinalizer::UninstallWebApp(
+bool BookmarkAppInstallFinalizer::CanUserUninstallFromSync(
+    const web_app::AppId& app_id) const {
+  const Extension* app = GetEnabledExtension(app_id);
+  DCHECK(app);
+  return extensions::ExtensionSystem::Get(profile_)
+      ->management_policy()
+      ->UserMayModifySettings(app, nullptr);
+}
+
+void BookmarkAppInstallFinalizer::UninstallWebAppFromSyncByUser(
+    const web_app::AppId& app_id,
+    UninstallWebAppCallback callback) {
+  // Bookmark apps don't support app installation from different sources.
+  // Uninstall extension completely:
+  UninstallExtension(app_id, std::move(callback));
+}
+
+void BookmarkAppInstallFinalizer::UninstallExtension(
     const web_app::AppId& app_id,
     UninstallWebAppCallback callback) {
   if (!GetEnabledExtension(app_id)) {
@@ -205,15 +222,6 @@ void BookmarkAppInstallFinalizer::RevealAppShim(const web_app::AppId& app_id) {
 #endif  // defined(OS_MACOSX)
 }
 
-bool BookmarkAppInstallFinalizer::CanUserUninstallFromSync(
-    const web_app::AppId& app_id) const {
-  const Extension* app = GetEnabledExtension(app_id);
-  DCHECK(app);
-  return extensions::ExtensionSystem::Get(profile_)
-      ->management_policy()
-      ->UserMayModifySettings(app, nullptr);
-}
-
 void BookmarkAppInstallFinalizer::SetCrxInstallerFactoryForTesting(
     CrxInstallerFactory crx_installer_factory) {
   crx_installer_factory_ = crx_installer_factory;

chrome/browser/web_applications/extensions/bookmark_app_install_finalizer.h

@@ -44,11 +44,11 @@ class BookmarkAppInstallFinalizer : public web_app::InstallFinalizer {
                       InstallFinalizedCallback callback) override;
   void UninstallExternalWebApp(const GURL& app_url,
                                UninstallWebAppCallback callback) override;
-  void UninstallWebApp(const web_app::AppId& app_id,
-                       UninstallWebAppCallback) override;
+  bool CanUserUninstallFromSync(const web_app::AppId& app_id) const override;
+  void UninstallWebAppFromSyncByUser(const web_app::AppId& app_id,
+                                     UninstallWebAppCallback) override;
   bool CanRevealAppShim() const override;
   void RevealAppShim(const web_app::AppId& app_id) override;
-  bool CanUserUninstallFromSync(const web_app::AppId& app_id) const override;
 
   using CrxInstallerFactory =
       base::RepeatingCallback<scoped_refptr<CrxInstaller>(Profile*)>;
@@ -59,6 +59,9 @@ class BookmarkAppInstallFinalizer : public web_app::InstallFinalizer {
   // May return nullptr if app_id is not found or extension is disabled.
   const Extension* GetEnabledExtension(const web_app::AppId& app_id) const;
 
+  void UninstallExtension(const web_app::AppId& app_id,
+                          UninstallWebAppCallback);
+
   void OnExtensionInstalled(const GURL& app_url,
                             LaunchType launch_type,
                             bool is_locally_installed,

chrome/browser/web_applications/extensions/pending_app_install_task_unittest.cc

@@ -13,6 +13,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/run_loop.h"
@@ -197,8 +198,16 @@ class TestPendingAppInstallFinalizer : public InstallFinalizer {
             }));
   }
 
-  void UninstallWebApp(const AppId& app_dd,
-                       UninstallWebAppCallback callback) override {}
+  bool CanUserUninstallFromSync(const AppId& app_id) const override {
+    NOTIMPLEMENTED();
+    return false;
+  }
+
+  void UninstallWebAppFromSyncByUser(
+      const AppId& app_dd,
+      UninstallWebAppCallback callback) override {
+    NOTIMPLEMENTED();
+  }
 
   bool CanAddAppToQuickLaunchBar() const override { return true; }
 
@@ -223,11 +232,6 @@ class TestPendingAppInstallFinalizer : public InstallFinalizer {
     ++num_reveal_appshim_calls_;
   }
 
-  bool CanUserUninstallFromSync(const AppId& app_id) const override {
-    NOTIMPLEMENTED();
-    return false;
-  }
-
  private:
   TestAppRegistrar* registrar_ = nullptr;
 

chrome/browser/web_applications/test/test_install_finalizer.cc

@@ -21,7 +21,7 @@ AppId TestInstallFinalizer::GetAppIdForUrl(const GURL& url) {
   return GenerateAppIdFromURL(url);
 }
 
-TestInstallFinalizer::TestInstallFinalizer() {}
+TestInstallFinalizer::TestInstallFinalizer() = default;
 
 TestInstallFinalizer::~TestInstallFinalizer() = default;
 
@@ -69,8 +69,16 @@ void TestInstallFinalizer::UninstallExternalWebApp(
                      }));
 }
 
-void TestInstallFinalizer::UninstallWebApp(const AppId& app_url,
-                                           UninstallWebAppCallback callback) {}
+bool TestInstallFinalizer::CanUserUninstallFromSync(const AppId& app_id) const {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+void TestInstallFinalizer::UninstallWebAppFromSyncByUser(
+    const AppId& app_url,
+    UninstallWebAppCallback callback) {
+  NOTIMPLEMENTED();
+}
 
 bool TestInstallFinalizer::CanAddAppToQuickLaunchBar() const {
   return true;
@@ -99,11 +107,6 @@ void TestInstallFinalizer::RevealAppShim(const AppId& app_id) {
   ++num_reveal_appshim_calls_;
 }
 
-bool TestInstallFinalizer::CanUserUninstallFromSync(const AppId& app_id) const {
-  NOTIMPLEMENTED();
-  return false;
-}
-
 void TestInstallFinalizer::SetNextFinalizeInstallResult(
     const AppId& app_id,
     InstallResultCode code) {

chrome/browser/web_applications/test/test_install_finalizer.h

@@ -37,8 +37,9 @@ class TestInstallFinalizer final : public InstallFinalizer {
                       InstallFinalizedCallback callback) override;
   void UninstallExternalWebApp(const GURL& app_url,
                                UninstallWebAppCallback callback) override;
-  void UninstallWebApp(const AppId& app_id,
-                       UninstallWebAppCallback callback) override;
+  bool CanUserUninstallFromSync(const AppId& app_id) const override;
+  void UninstallWebAppFromSyncByUser(const AppId& app_id,
+                                     UninstallWebAppCallback callback) override;
   bool CanAddAppToQuickLaunchBar() const override;
   void AddAppToQuickLaunchBar(const AppId& app_id) override;
   bool CanReparentTab(const AppId& app_id,
@@ -48,7 +49,6 @@ class TestInstallFinalizer final : public InstallFinalizer {
                    content::WebContents* web_contents) override;
   bool CanRevealAppShim() const override;
   void RevealAppShim(const AppId& app_id) override;
-  bool CanUserUninstallFromSync(const AppId& app_id) const override;
 
   void SetNextFinalizeInstallResult(const AppId& app_id,
                                     InstallResultCode code);

chrome/browser/web_applications/web_app_install_finalizer.cc

@@ -232,22 +232,29 @@ void WebAppInstallFinalizer::UninstallExternalWebApp(
   NOTIMPLEMENTED();
 }
 
-void WebAppInstallFinalizer::FinalizeUpdate(
-    const WebApplicationInfo& web_app_info,
-    InstallFinalizedCallback callback) {
-  // TODO(crbug.com/926083): Implement update logic, this requires updating
-  // WebAppIconManager to clean out the existing icons and write new ones.
-  NOTIMPLEMENTED();
+bool WebAppInstallFinalizer::CanUserUninstallFromSync(
+    const AppId& app_id) const {
+  // TODO(crbug.com/901226): Implement it.
+  return false;
 }
 
-void WebAppInstallFinalizer::UninstallWebApp(const AppId& app_id,
-                                             UninstallWebAppCallback) {
+void WebAppInstallFinalizer::UninstallWebAppFromSyncByUser(
+    const AppId& app_id,
+    UninstallWebAppCallback) {
   // TODO(loyso): Implement The Unified Uninstall API. Expose Source as an
   // argument for UninstallWebApp method. Do app->RemoveSource from the app and
   // uninstall the app if no more sources interested.
   NOTIMPLEMENTED();
 }
 
+void WebAppInstallFinalizer::FinalizeUpdate(
+    const WebApplicationInfo& web_app_info,
+    InstallFinalizedCallback callback) {
+  // TODO(crbug.com/926083): Implement update logic, this requires updating
+  // WebAppIconManager to clean out the existing icons and write new ones.
+  NOTIMPLEMENTED();
+}
+
 void WebAppInstallFinalizer::OnIconsDataWritten(
     InstallFinalizedCallback callback,
     std::unique_ptr<WebApp> web_app,
@@ -315,10 +322,4 @@ void WebAppInstallFinalizer::RevealAppShim(const AppId& app_id) {
   NOTIMPLEMENTED();
 }
 
-bool WebAppInstallFinalizer::CanUserUninstallFromSync(
-    const AppId& app_id) const {
-  // TODO(crbug.com/901226): Implement it.
-  return false;
-}
-
 }  // namespace web_app

chrome/browser/web_applications/web_app_install_finalizer.h

@@ -38,10 +38,11 @@ class WebAppInstallFinalizer final : public InstallFinalizer {
                       InstallFinalizedCallback callback) override;
   void UninstallExternalWebApp(const GURL& app_url,
                                UninstallWebAppCallback callback) override;
-  void UninstallWebApp(const AppId& app_id, UninstallWebAppCallback) override;
+  bool CanUserUninstallFromSync(const AppId& app_id) const override;
+  void UninstallWebAppFromSyncByUser(const AppId& app_id,
+                                     UninstallWebAppCallback) override;
   bool CanRevealAppShim() const override;
   void RevealAppShim(const AppId& app_id) override;
-  bool CanUserUninstallFromSync(const AppId& app_id) const override;
 
  private:
   void OnIconsDataWritten(InstallFinalizedCallback callback,