WebApps: AndroidSmsAppSetupController no longer relies on Extensions

Migrate AndroidSmsAppSetupController to use the new web_app:: APIs,
in preparation for the extensions-based implementation of desktop PWAs
being retired.

Bug: 1052709
Change-Id: I2dfb503975d5073dc7f152d2dcced2943819e8c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2060403
Auto-Submit: Eric Willigers <ericwilligers@chromium.org>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743323}

chrome/browser/chromeos/BUILD.gn

@@ -2588,6 +2588,7 @@ static_library("test_support") {
 
   deps = [
     ":chromeos",
+    "//chrome/browser/web_applications/components",
     "//chrome/test:test_support",
     "//chromeos",
     "//chromeos/components/drivefs",

chrome/browser/chromeos/android_sms/android_sms_app_manager_impl.cc

@@ -17,7 +17,6 @@
 #include "chromeos/components/multidevice/logging/logging.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
-#include "extensions/common/extension.h"
 
 namespace chromeos {
 
@@ -177,7 +176,7 @@ void AndroidSmsAppManagerImpl::OnSetUpNewAppResult(
     bool success) {
   is_new_app_setup_in_progress_ = false;
 
-  const extensions::Extension* new_pwa = setup_controller_->GetPwa(
+  base::Optional<web_app::AppId> new_pwa = setup_controller_->GetPwa(
       GetAndroidMessagesURL(true /* use_install_url */));
 
   // If the app failed to install or the PWA does not exist, do not launch.
@@ -196,13 +195,13 @@ void AndroidSmsAppManagerImpl::OnSetUpNewAppResult(
     return;
   }
 
-  const extensions::Extension* old_pwa = setup_controller_->GetPwa(
+  base::Optional<web_app::AppId> old_pwa = setup_controller_->GetPwa(
       GetAndroidMessagesURL(true /* use_install_url */, *migrating_from));
 
   // Transfer attributes from the old PWA to the new one. This ensures that the
   // PWA's placement in the app launcher and shelf remains constant..
   bool transfer_attributes_success = pwa_delegate_->TransferItemAttributes(
-      old_pwa->id() /* from_app_id */, new_pwa->id() /* to_app_id */,
+      *old_pwa /* from_app_id */, *new_pwa /* to_app_id */,
       app_list_syncable_service_);
   if (!transfer_attributes_success) {
     PA_LOG(ERROR) << "AndroidSmsAppManagerImpl::OnSetUpNewAppResult(): Failed "
@@ -253,10 +252,8 @@ void AndroidSmsAppManagerImpl::HandleAppSetupFinished() {
                   << "Launching Messages PWA.";
   pwa_delegate_->OpenApp(
       profile_, apps::AppLaunchParams(
-                    setup_controller_
-                        ->GetPwa(GetAndroidMessagesURL(
-                            true /* use_install_url */, *domain))
-                        ->id(),
+                    *setup_controller_->GetPwa(GetAndroidMessagesURL(
+                        true /* use_install_url */, *domain)),
                     apps::mojom::LaunchContainer::kLaunchContainerWindow,
                     WindowOpenDisposition::NEW_WINDOW,
                     apps::mojom::AppLaunchSource::kSourceChromeInternal));

chrome/browser/chromeos/android_sms/android_sms_app_manager_impl_unittest.cc

@@ -19,7 +19,6 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/test/browser_task_environment.h"
-#include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
@@ -195,7 +194,7 @@ TEST_F(AndroidSmsAppManagerImplTest,
   EXPECT_EQ(kNewAppId, fake_android_sms_app_setup_controller()
                            ->GetAppMetadataAtUrl(GetAndroidMessagesURL(
                                true /* use_install_url */))
-                           ->pwa->id());
+                           ->pwa);
   EXPECT_TRUE(fake_android_sms_app_setup_controller()
                   ->GetAppMetadataAtUrl(install_url)
                   ->is_cookie_present);
@@ -232,7 +231,7 @@ TEST_F(AndroidSmsAppManagerImplTest, TestSetUpMessagesAndLaunch_NoPreviousApp) {
   EXPECT_EQ(kNewAppId, fake_android_sms_app_setup_controller()
                            ->GetAppMetadataAtUrl(GetAndroidMessagesURL(
                                true /* use_install_url */))
-                           ->pwa->id());
+                           ->pwa);
   EXPECT_TRUE(fake_android_sms_app_setup_controller()
                   ->GetAppMetadataAtUrl(install_url)
                   ->is_cookie_present);
@@ -275,7 +274,7 @@ TEST_F(AndroidSmsAppManagerImplTest,
   EXPECT_EQ(kOldAppId, fake_android_sms_app_setup_controller()
                            ->GetAppMetadataAtUrl(GetAndroidMessagesURLOld(
                                true /* use_install_url */))
-                           ->pwa->id());
+                           ->pwa);
   EXPECT_TRUE(fake_android_sms_app_setup_controller()
                   ->GetAppMetadataAtUrl(
                       GetAndroidMessagesURLOld(true /* use_install_url */))
@@ -301,7 +300,7 @@ TEST_F(AndroidSmsAppManagerImplTest,
   EXPECT_EQ(kNewAppId, fake_android_sms_app_setup_controller()
                            ->GetAppMetadataAtUrl(GetAndroidMessagesURL(
                                true /* use_install_url */))
-                           ->pwa->id());
+                           ->pwa);
   EXPECT_TRUE(fake_android_sms_app_setup_controller()
                   ->GetAppMetadataAtUrl(
                       GetAndroidMessagesURL(true /* use_install_url */))
@@ -340,7 +339,7 @@ TEST_F(AndroidSmsAppManagerImplTest, TestManualUninstall) {
   EXPECT_EQ(kNewAppId, fake_android_sms_app_setup_controller()
                            ->GetAppMetadataAtUrl(GetAndroidMessagesURL(
                                true /* use_install_url */))
-                           ->pwa->id());
+                           ->pwa);
   EXPECT_TRUE(fake_android_sms_app_setup_controller()
                   ->GetAppMetadataAtUrl(install_url)
                   ->is_cookie_present);

chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h

@@ -7,12 +7,9 @@
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
+#include "chrome/browser/web_applications/components/web_app_id.h"
 #include "url/gurl.h"
 
-namespace extensions {
-class Extension;
-}  // namespace extensions
-
 namespace chromeos {
 
 namespace android_sms {
@@ -38,9 +35,9 @@ class AndroidSmsAppSetupController {
                         const GURL& install_url,
                         SuccessCallback callback) = 0;
 
-  // Returns the extension for the PWA at |install_url|; if no PWA exists, null
-  // is returned.
-  virtual const extensions::Extension* GetPwa(const GURL& install_url) = 0;
+  // Returns the id for the PWA at |install_url|; if no PWA exists,
+  // base::nullopt is returned.
+  virtual base::Optional<web_app::AppId> GetPwa(const GURL& install_url) = 0;
 
   // Deletes the cookie which causes the PWA to remember this computer by
   // default. Note that this does not actually stop the PWA from remembering

chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.cc

@@ -14,19 +14,18 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/optional.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/web_applications/components/external_install_options.h"
+#include "chrome/browser/web_applications/components/install_finalizer.h"
 #include "chrome/browser/web_applications/components/pending_app_manager.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
 #include "chrome/browser/web_applications/components/web_app_helpers.h"
+#include "chrome/browser/web_applications/components/web_app_provider_base.h"
 #include "chrome/common/chrome_features.h"
 #include "chromeos/components/multidevice/logging/logging.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"
-#include "extensions/browser/extension_system.h"
-#include "extensions/browser/uninstall_reason.h"
 #include "net/base/url_util.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
@@ -53,17 +52,11 @@ AndroidSmsAppSetupControllerImpl::PwaDelegate::PwaDelegate() = default;
 
 AndroidSmsAppSetupControllerImpl::PwaDelegate::~PwaDelegate() = default;
 
-const extensions::Extension*
+base::Optional<web_app::AppId>
 AndroidSmsAppSetupControllerImpl::PwaDelegate::GetPwaForUrl(
     const GURL& install_url,
     Profile* profile) {
-  base::Optional<web_app::AppId> app_id =
-      web_app::FindInstalledAppWithUrlInScope(profile, install_url);
-
-  // TODO(crbug.com/1052709): Return app_id, avoid dependence on Extensions.
-  return app_id ? extensions::ExtensionRegistry::Get(profile)
-                      ->GetInstalledExtension(*app_id)
-                : nullptr;
+  return web_app::FindInstalledAppWithUrlInScope(profile, install_url);
 }
 
 network::mojom::CookieManager*
@@ -74,15 +67,19 @@ AndroidSmsAppSetupControllerImpl::PwaDelegate::GetCookieManager(
       ->GetCookieManagerForBrowserProcess();
 }
 
-bool AndroidSmsAppSetupControllerImpl::PwaDelegate::RemovePwa(
-    const extensions::ExtensionId& extension_id,
-    base::string16* error,
-    Profile* profile) {
-  return extensions::ExtensionSystem::Get(profile)
-      ->extension_service()
-      ->UninstallExtension(
-          extension_id,
-          extensions::UNINSTALL_REASON_ORPHANED_EXTERNAL_EXTENSION, error);
+void AndroidSmsAppSetupControllerImpl::PwaDelegate::RemovePwa(
+    const web_app::AppId& app_id,
+    Profile* profile,
+    SuccessCallback callback) {
+  auto* provider = web_app::WebAppProviderBase::GetProviderBase(profile);
+  if (!provider) {
+    std::move(callback).Run(false);
+    return;
+  }
+
+  provider->install_finalizer().UninstallExternalWebApp(
+      app_id, web_app::ExternalInstallSource::kInternalDefault,
+      std::move(callback));
 }
 
 AndroidSmsAppSetupControllerImpl::AndroidSmsAppSetupControllerImpl(
@@ -122,7 +119,7 @@ void AndroidSmsAppSetupControllerImpl::SetUpApp(const GURL& app_url,
                          std::move(callback)));
 }
 
-const extensions::Extension* AndroidSmsAppSetupControllerImpl::GetPwa(
+base::Optional<web_app::AppId> AndroidSmsAppSetupControllerImpl::GetPwa(
     const GURL& install_url) {
   return pwa_delegate_->GetPwaForUrl(install_url, profile_);
 }
@@ -151,11 +148,11 @@ void AndroidSmsAppSetupControllerImpl::RemoveApp(
     const GURL& install_url,
     const GURL& migrated_to_app_url,
     SuccessCallback callback) {
-  const extensions::Extension* extension =
+  base::Optional<web_app::AppId> app_id =
       pwa_delegate_->GetPwaForUrl(install_url, profile_);
 
   // If there is no app installed at |url|, there is nothing more to do.
-  if (!extension) {
+  if (!app_id) {
     PA_LOG(VERBOSE) << "AndroidSmsAppSetupControllerImpl::RemoveApp(): No app "
                     << "is installed at " << install_url
                     << "; skipping removal process.";
@@ -166,17 +163,24 @@ void AndroidSmsAppSetupControllerImpl::RemoveApp(
   PA_LOG(INFO) << "AndroidSmsAppSetupControllerImpl::RemoveApp(): "
                << "Uninstalling app at " << install_url << ".";
 
-  const extensions::ExtensionId& extension_id = extension->id();
-  base::string16 error;
-  bool uninstalled_successfully =
-      pwa_delegate_->RemovePwa(extension_id, &error, profile_);
-  UMA_HISTOGRAM_BOOLEAN("AndroidSms.PWAUninstallationResult",
-                        uninstalled_successfully);
+  pwa_delegate_->RemovePwa(
+      *app_id, profile_,
+      base::BindOnce(&AndroidSmsAppSetupControllerImpl::OnAppRemoved,
+                     weak_ptr_factory_.GetWeakPtr(), std::move(callback),
+                     app_url, install_url, migrated_to_app_url));
+}
+
+void AndroidSmsAppSetupControllerImpl::OnAppRemoved(
+    SuccessCallback callback,
+    const GURL& app_url,
+    const GURL& install_url,
+    const GURL& migrated_to_app_url,
+    bool uninstalled) {
+  UMA_HISTOGRAM_BOOLEAN("AndroidSms.PWAUninstallationResult", uninstalled);
 
-  if (!uninstalled_successfully) {
+  if (!uninstalled) {
     PA_LOG(ERROR) << "AndroidSmsAppSetupControllerImpl::RemoveApp(): "
-                  << "PWA for " << install_url << " failed to uninstall. "
-                  << error;
+                  << "PWA for " << install_url << " failed to uninstall.";
     std::move(callback).Run(false /* success */);
     return;
   }

chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl.h

@@ -9,7 +9,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/unguessable_token.h"
 #include "chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h"
-#include "extensions/common/extension_id.h"
+#include "chrome/browser/web_applications/components/web_app_id.h"
 #include "net/cookies/canonical_cookie.h"
 #include "url/gurl.h"
 
@@ -54,21 +54,20 @@ class AndroidSmsAppSetupControllerImpl : public AndroidSmsAppSetupController {
     PwaDelegate();
     virtual ~PwaDelegate();
 
-    virtual const extensions::Extension* GetPwaForUrl(const GURL& install_url,
-                                                      Profile* profile);
+    virtual base::Optional<web_app::AppId> GetPwaForUrl(const GURL& install_url,
+                                                        Profile* profile);
     virtual network::mojom::CookieManager* GetCookieManager(const GURL& app_url,
                                                             Profile* profile);
-    // |error| will contain the failure reason if RemovePwa returns false.
-    virtual bool RemovePwa(const extensions::ExtensionId& extension_id,
-                           base::string16* error,
-                           Profile* profile);
+    virtual void RemovePwa(const web_app::AppId& app_id,
+                           Profile* profile,
+                           SuccessCallback callback);
   };
 
   // AndroidSmsAppSetupController:
   void SetUpApp(const GURL& app_url,
                 const GURL& install_url,
                 SuccessCallback callback) override;
-  const extensions::Extension* GetPwa(const GURL& install_url) override;
+  base::Optional<web_app::AppId> GetPwa(const GURL& install_url) override;
   void DeleteRememberDeviceByDefaultCookie(const GURL& app_url,
                                            SuccessCallback callback) override;
   void RemoveApp(const GURL& app_url,
@@ -76,6 +75,11 @@ class AndroidSmsAppSetupControllerImpl : public AndroidSmsAppSetupController {
                  const GURL& migrated_to_app_url,
                  SuccessCallback callback) override;
 
+  void OnAppRemoved(SuccessCallback callback,
+                    const GURL& app_url,
+                    const GURL& install_url,
+                    const GURL& migrated_to_app_url,
+                    bool uninstalled);
   void OnSetRememberDeviceByDefaultCookieResult(
       const GURL& app_url,
       const GURL& install_url,

chrome/browser/chromeos/android_sms/android_sms_app_setup_controller_impl_unittest.cc

@@ -22,13 +22,11 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/web_applications/components/external_install_options.h"
 #include "chrome/browser/web_applications/components/web_app_constants.h"
+#include "chrome/browser/web_applications/components/web_app_helpers.h"
 #include "chrome/browser/web_applications/test/test_pending_app_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/test/browser_task_environment.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/extension_builder.h"
-#include "extensions/common/extension_paths.h"
 #include "services/network/test/test_cookie_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/mojom/manifest/display_mode.mojom.h"
@@ -143,21 +141,16 @@ class AndroidSmsAppSetupControllerImplTest : public testing::Test {
       if (base::Contains(url_to_pwa_map_, url))
         return;
 
-      // Create a test Extension and add it to |url_to_pwa_map_|.
-      base::FilePath path;
-      base::PathService::Get(extensions::DIR_TEST_DATA, &path);
-      url_to_pwa_map_[url] = extensions::ExtensionBuilder(url.spec())
-                                 .SetPath(path.AppendASCII(url.spec()))
-                                 .Build();
+      url_to_pwa_map_[url] = web_app::GenerateAppIdFromURL(url);
     }
 
     // AndroidSmsAppSetupControllerImpl::PwaDelegate:
-    const extensions::Extension* GetPwaForUrl(const GURL& install_url,
-                                              Profile* profile) override {
+    base::Optional<web_app::AppId> GetPwaForUrl(const GURL& install_url,
+                                                Profile* profile) override {
       if (!base::Contains(url_to_pwa_map_, install_url))
-        return nullptr;
+        return base::nullopt;
 
-      return url_to_pwa_map_[install_url].get();
+      return url_to_pwa_map_[install_url];
     }
 
     network::mojom::CookieManager* GetCookieManager(const GURL& app_url,
@@ -165,23 +158,24 @@ class AndroidSmsAppSetupControllerImplTest : public testing::Test {
       return fake_cookie_manager_;
     }
 
-    bool RemovePwa(const extensions::ExtensionId& extension_id,
-                   base::string16* error,
-                   Profile* profile) override {
+    void RemovePwa(
+        const web_app::AppId& app_id,
+        Profile* profile,
+        AndroidSmsAppSetupController::SuccessCallback callback) override {
       for (const auto& url_pwa_pair : url_to_pwa_map_) {
-        if (url_pwa_pair.second->id() == extension_id) {
+        if (url_pwa_pair.second == app_id) {
           url_to_pwa_map_.erase(url_pwa_pair.first);
-          return true;
+          std::move(callback).Run(true);
+          return;
         }
       }
 
-      return false;
+      std::move(callback).Run(false);
     }
 
    private:
     FakeCookieManager* fake_cookie_manager_;
-    base::flat_map<GURL, scoped_refptr<const extensions::Extension>>
-        url_to_pwa_map_;
+    base::flat_map<GURL, web_app::AppId> url_to_pwa_map_;
   };
 
   AndroidSmsAppSetupControllerImplTest()
@@ -358,7 +352,7 @@ class AndroidSmsAppSetupControllerImplTest : public testing::Test {
     base::HistogramTester histogram_tester;
 
     bool was_installed =
-        test_pwa_delegate_->GetPwaForUrl(install_url, &profile_) != nullptr;
+        test_pwa_delegate_->GetPwaForUrl(install_url, &profile_).has_value();
     setup_controller_->RemoveApp(
         app_url, install_url, migrated_to_app_url,
         base::BindOnce(&AndroidSmsAppSetupControllerImplTest::OnRemoveAppResult,

chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.cc

@@ -7,9 +7,6 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "extensions/common/extension.h"
-#include "extensions/common/extension_builder.h"
-#include "extensions/common/extension_paths.h"
 
 namespace chromeos {
 
@@ -37,27 +34,19 @@ FakeAndroidSmsAppSetupController::GetAppMetadataAtUrl(
 
 void FakeAndroidSmsAppSetupController::SetAppAtUrl(
     const GURL& install_url,
-    const base::Optional<extensions::ExtensionId>& id_for_app) {
+    const base::Optional<web_app::AppId>& id_for_app) {
   if (!id_for_app) {
     install_url_to_metadata_map_.erase(install_url);
     return;
   }
 
-  // Create a test Extension and add it to |install_url_to_metadata_map_|.
-  base::FilePath path;
-  base::PathService::Get(extensions::DIR_TEST_DATA, &path);
-  install_url_to_metadata_map_[install_url].pwa =
-      extensions::ExtensionBuilder(
-          install_url.spec(), extensions::ExtensionBuilder::Type::PLATFORM_APP)
-          .SetPath(path.AppendASCII(install_url.spec()))
-          .SetID(*id_for_app)
-          .Build();
+  install_url_to_metadata_map_[install_url].pwa = *id_for_app;
 }
 
 void FakeAndroidSmsAppSetupController::CompletePendingSetUpAppRequest(
     const GURL& expected_app_url,
     const GURL& expected_install_url,
-    const base::Optional<extensions::ExtensionId>& id_for_app) {
+    const base::Optional<web_app::AppId>& id_for_app) {
   DCHECK(!pending_set_up_app_requests_.empty());
 
   auto request = std::move(pending_set_up_app_requests_.front());
@@ -119,12 +108,12 @@ void FakeAndroidSmsAppSetupController::SetUpApp(const GURL& app_url,
       app_url, install_url, std::move(callback)));
 }
 
-const extensions::Extension* FakeAndroidSmsAppSetupController::GetPwa(
+base::Optional<web_app::AppId> FakeAndroidSmsAppSetupController::GetPwa(
     const GURL& install_url) {
   auto it = install_url_to_metadata_map_.find(install_url);
   if (it == install_url_to_metadata_map_.end())
-    return nullptr;
-  return it->second.pwa.get();
+    return base::nullopt;
+  return it->second.pwa;
 }
 
 void FakeAndroidSmsAppSetupController::DeleteRememberDeviceByDefaultCookie(

chrome/browser/chromeos/android_sms/fake_android_sms_app_setup_controller.h

@@ -14,13 +14,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/optional.h"
 #include "chrome/browser/chromeos/android_sms/android_sms_app_setup_controller.h"
-#include "extensions/common/extension_id.h"
+#include "chrome/browser/web_applications/components/web_app_id.h"
 #include "url/gurl.h"
 
-namespace extensions {
-class Extension;
-}  // namespace extensions
-
 namespace chromeos {
 
 namespace android_sms {
@@ -36,7 +32,7 @@ class FakeAndroidSmsAppSetupController : public AndroidSmsAppSetupController {
     AppMetadata(const AppMetadata& other);
     ~AppMetadata();
 
-    scoped_refptr<const extensions::Extension> pwa;
+    web_app::AppId pwa;
     bool is_cookie_present = true;
   };
 
@@ -47,15 +43,15 @@ class FakeAndroidSmsAppSetupController : public AndroidSmsAppSetupController {
   // ID at |install_url|. Otherwise, this function removes any existing app at
   // that URL.
   void SetAppAtUrl(const GURL& install_url,
-                   const base::Optional<extensions::ExtensionId>& id_for_app);
+                   const base::Optional<web_app::AppId>& id_for_app);
 
   // Completes a pending setup request (i.e., a previous call to SetUpApp()).
   // If |id_for_app| is set, the request is successful and the installed app
-  // will have the provided ID; if |id_for_app| is null, the request fails.
+  // will have the provided ID; if |id_for_app| is nullopt, the request fails.
   void CompletePendingSetUpAppRequest(
       const GURL& expected_app_url,
       const GURL& expected_install_url,
-      const base::Optional<extensions::ExtensionId>& id_for_app);
+      const base::Optional<web_app::AppId>& id_for_app);
 
   // Completes a pending cookie deletion request (i.e., a previous call to
   // DeleteRememberDeviceByDefaultCookie()).
@@ -75,7 +71,7 @@ class FakeAndroidSmsAppSetupController : public AndroidSmsAppSetupController {
   void SetUpApp(const GURL& app_url,
                 const GURL& install_url,
                 SuccessCallback callback) override;
-  const extensions::Extension* GetPwa(const GURL& install_url) override;
+  base::Optional<web_app::AppId> GetPwa(const GURL& install_url) override;
   void DeleteRememberDeviceByDefaultCookie(const GURL& app_url,
                                            SuccessCallback callback) override;
   void RemoveApp(const GURL& app_url,