WebApp: Retire BookmarkAppAcceptanceCallback

AppInstallationAcceptanceCallback
now accepts a unique_ptr.

The type adapter function
BookmarkAppAcceptanceCallback
is no longer required.

Bug: 915043
Change-Id: Ia32ca1f704c5e110da0fe5e677218d1913dce7dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1600939Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Alexey Baskakov <loyso@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658724}

chrome/browser/extensions/bookmark_app_helper.cc

@@ -367,14 +367,16 @@ void BookmarkAppHelper::OnIconsDownloaded(
 
   if (!contents_) {
     // The web contents can be null in tests.
-    OnBubbleCompleted(true, web_app_info_);
+    OnBubbleCompleted(true,
+                      std::make_unique<WebApplicationInfo>(web_app_info_));
     return;
   }
 
   Browser* browser = chrome::FindBrowserWithWebContents(contents_);
   if (!browser) {
     // The browser can be null in tests.
-    OnBubbleCompleted(true, web_app_info_);
+    OnBubbleCompleted(true,
+                      std::make_unique<WebApplicationInfo>(web_app_info_));
     return;
   }
 
@@ -404,9 +406,10 @@ void BookmarkAppHelper::OnIconsDownloaded(
 
 void BookmarkAppHelper::OnBubbleCompleted(
     bool user_accepted,
-    const WebApplicationInfo& web_app_info) {
+    std::unique_ptr<WebApplicationInfo> web_app_info) {
   if (user_accepted) {
-    web_app_info_ = web_app_info;
+    DCHECK(web_app_info);
+    web_app_info_ = *web_app_info;
 
     if (is_policy_installed_app_)
       crx_installer_->set_install_source(Manifest::EXTERNAL_POLICY_DOWNLOAD);

chrome/browser/extensions/bookmark_app_helper.h

@@ -164,7 +164,7 @@ class BookmarkAppHelper : public content::NotificationObserver {
   // Called after the bubble has been shown, and the user has either accepted or
   // the dialog was dismissed.
   void OnBubbleCompleted(bool user_accepted,
-                         const WebApplicationInfo& web_app_info);
+                         std::unique_ptr<WebApplicationInfo> web_app_info);
 
   // Called when the installation of the app is complete to perform the final
   // installation steps.

chrome/browser/extensions/bookmark_app_helper_browsertest.cc

@@ -182,8 +182,9 @@ IN_PROC_BROWSER_TEST_F(BookmarkAppHelperTest, CreateWindowedPWAIntoAppWindow) {
 
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> observer(this);
   observer.Add(ExtensionRegistry::Get(browser()->profile()));
-  bookmark_app_helper_->OnBubbleCompleted(true,
-                                          bookmark_app_helper_->web_app_info_);
+  bookmark_app_helper_->OnBubbleCompleted(
+      true, std::make_unique<WebApplicationInfo>(
+                bookmark_app_helper_->web_app_info_));
   Wait();  // Quits when the extension install completes.
 
   Browser* app_browser = chrome::FindBrowserWithWebContents(web_contents());

chrome/browser/ui/browser_dialogs.h

@@ -96,7 +96,7 @@ void ShowCreateChromeAppShortcutsDialog(
 // WebApplicationInfo parameter contains the information about the app,
 // possibly modified by the user.
 using AppInstallationAcceptanceCallback =
-    base::OnceCallback<void(bool, const WebApplicationInfo&)>;
+    base::OnceCallback<void(bool, std::unique_ptr<WebApplicationInfo>)>;
 
 // Shows the Bookmark App bubble.
 // See Extension::InitFromValueFlags::FROM_BOOKMARK for a description of

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc

@@ -118,15 +118,18 @@ bool BookmarkAppConfirmationView::ShouldShowCloseButton() const {
 }
 
 void BookmarkAppConfirmationView::WindowClosing() {
-  if (callback_)
-    std::move(callback_).Run(false, web_app_info_);
+  if (callback_) {
+    std::move(callback_).Run(
+        false, std::make_unique<WebApplicationInfo>(web_app_info_));
+  }
 }
 
 bool BookmarkAppConfirmationView::Accept() {
   web_app_info_.title = GetTrimmedTitle();
   web_app_info_.open_as_window =
       open_as_window_checkbox_ && open_as_window_checkbox_->checked();
-  std::move(callback_).Run(true, web_app_info_);
+  std::move(callback_).Run(true,
+                           std::make_unique<WebApplicationInfo>(web_app_info_));
   return true;
 }
 

chrome/browser/ui/views/extensions/pwa_confirmation.cc

@@ -124,12 +124,15 @@ base::string16 PWAConfirmation::GetDialogButtonLabel(ui::DialogButton button) {
 }
 
 void PWAConfirmation::Accept() {
-  std::move(callback_).Run(true, web_app_info_);
+  std::move(callback_).Run(true,
+                           std::make_unique<WebApplicationInfo>(web_app_info_));
 }
 
 void PWAConfirmation::WindowClosing() {
-  if (callback_)
-    std::move(callback_).Run(false, web_app_info_);
+  if (callback_) {
+    std::move(callback_).Run(
+        false, std::make_unique<WebApplicationInfo>(web_app_info_));
+  }
 }
 
 namespace chrome {

chrome/browser/ui/web_applications/web_app_dialog_utils.cc

@@ -25,26 +25,13 @@ namespace web_app {
 
 namespace {
 
-// Use tricky function adapters here to connect old API with new unique_ptr
-// based API. TODO(loyso): Erase these type adapters. crbug.com/915043.
-using AcceptanceCallback = InstallManager::WebAppInstallationAcceptanceCallback;
-
-void BookmarkAppAcceptanceCallback(
-    AcceptanceCallback web_app_acceptance_callback,
-    bool user_accepted,
-    const WebApplicationInfo& web_app_info) {
-  std::move(web_app_acceptance_callback)
-      .Run(user_accepted, std::make_unique<WebApplicationInfo>(web_app_info));
-}
-
 void WebAppInstallDialogCallback(
     WebappInstallSource install_source,
     content::WebContents* initiator_web_contents,
     std::unique_ptr<WebApplicationInfo> web_app_info,
     ForInstallableSite for_installable_site,
-    AcceptanceCallback web_app_acceptance_callback) {
-  chrome::AppInstallationAcceptanceCallback adapted_callback = base::BindOnce(
-      BookmarkAppAcceptanceCallback, std::move(web_app_acceptance_callback));
+    InstallManager::WebAppInstallationAcceptanceCallback
+        web_app_acceptance_callback) {
   // This is a copy paste of BookmarkAppHelper::OnIconsDownloaded().
   // TODO(https://crbug.com/915043): Delete
   // BookmarkAppHelper::OnIconsDownloaded().
@@ -53,14 +40,14 @@ void WebAppInstallDialogCallback(
     web_app_info->open_as_window = true;
     if (install_source == WebappInstallSource::OMNIBOX_INSTALL_ICON) {
       chrome::ShowPWAInstallBubble(initiator_web_contents, *web_app_info,
-                                   std::move(adapted_callback));
+                                   std::move(web_app_acceptance_callback));
     } else {
       chrome::ShowPWAInstallDialog(initiator_web_contents, *web_app_info,
-                                   std::move(adapted_callback));
+                                   std::move(web_app_acceptance_callback));
     }
   } else {
     chrome::ShowBookmarkAppDialog(initiator_web_contents, *web_app_info,
-                                  std::move(adapted_callback));
+                                  std::move(web_app_acceptance_callback));
   }
 }