[Extensions] Migrate ExtensionInstallPrompt::Delegate to be a callback

chrome/browser/extensions/extension_disabled_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_disabled_ui.h"
 
 #include <bitset>
 #include <string>
 #include <utility>
 
@@ skipping 74 matching lines @@
 
 // Make a menu ID available when it is no longer used.
 void ReleaseMenuCommandID(int id) {
   menu_command_ids.Get().reset(id - IDC_EXTENSION_DISABLED_FIRST);
 }
 
 }  // namespace
 
 // ExtensionDisabledDialogDelegate --------------------------------------------
 
-class ExtensionDisabledDialogDelegate
-    : public ExtensionInstallPrompt::Delegate,
-      public base::RefCountedThreadSafe<ExtensionDisabledDialogDelegate> {
+class ExtensionDisabledDialogDelegate {
  public:
   ExtensionDisabledDialogDelegate(ExtensionService* service,
                                   scoped_ptr<ExtensionInstallPrompt> install_ui,
                                   const Extension* extension);
 
  private:
-  friend class base::RefCountedThreadSafe<ExtensionDisabledDialogDelegate>;
+  ~ExtensionDisabledDialogDelegate();
 
-  ~ExtensionDisabledDialogDelegate() override;
-
-  // ExtensionInstallPrompt::Delegate:
-  void InstallUIProceed() override;
-  void InstallUIAbort(bool user_initiated) override;
+  void InstallPromptDone(ExtensionInstallPrompt::Result result);
 
   // The UI for showing the install dialog when enabling.
   scoped_ptr<ExtensionInstallPrompt> install_ui_;
 
   ExtensionService* service_;
   const Extension* extension_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtensionDisabledDialogDelegate);

[Avi (use Gerrit), 2015/12/29 03:10:45]

base/macros.h

[Devlin, 2016/01/04 22:59:23]

Done.

 };
 
 ExtensionDisabledDialogDelegate::ExtensionDisabledDialogDelegate(
     ExtensionService* service,
     scoped_ptr<ExtensionInstallPrompt> install_ui,
     const Extension* extension)
     : install_ui_(std::move(install_ui)),
       service_(service),
       extension_(extension) {
-  AddRef();  // Balanced in Proceed or Abort.
   ExtensionInstallPrompt::PromptType type =
       ExtensionInstallPrompt::GetReEnablePromptTypeForExtension(
           service_->profile(), extension);
+  // Unretained() is safe since this object manages its own lifetime and deletes
+  // itself only once the prompt finishes.

[asargent_no_longer_on_chrome, 2015/12/31 00:45:56]

also because it owns install_ui_ (not sure if worth mentioning or not)

[Devlin, 2016/01/04 22:59:23]

See other comment.

   install_ui_->ShowDialog(
-      this, extension_, nullptr,
+      base::Bind(&ExtensionDisabledDialogDelegate::InstallPromptDone,
+                 base::Unretained(this)),
+      extension_, nullptr,
       make_scoped_ptr(new ExtensionInstallPrompt::Prompt(type)),
       ExtensionInstallPrompt::GetDefaultShowDialogCallback());
 }
 
 ExtensionDisabledDialogDelegate::~ExtensionDisabledDialogDelegate() {
 }
 
-void ExtensionDisabledDialogDelegate::InstallUIProceed() {
-  service_->GrantPermissionsAndEnableExtension(extension_);
-  Release();
-}
+void ExtensionDisabledDialogDelegate::InstallPromptDone(
+    ExtensionInstallPrompt::Result result) {
+  if (result == ExtensionInstallPrompt::Result::ACCEPTED) {
+    service_->GrantPermissionsAndEnableExtension(extension_);
+  } else {
+    const char* histogram_name =
+        result == ExtensionInstallPrompt::Result::USER_CANCELED
+            ? "ReEnableCancel"
+            : "ReEnableAbort";
+    ExtensionService::RecordPermissionMessagesHistogram(extension_,
+                                                        histogram_name);
+    // Do nothing. The extension will remain disabled.
+  }
 
-void ExtensionDisabledDialogDelegate::InstallUIAbort(bool user_initiated) {
-  std::string histogram_name = user_initiated ? "ReEnableCancel"
-                                              : "ReEnableAbort";
-  ExtensionService::RecordPermissionMessagesHistogram(
-      extension_, histogram_name.c_str());
-
-  // Do nothing. The extension will remain disabled.
-  Release();
+  delete this;
 }
 
 // ExtensionDisabledGlobalError -----------------------------------------------
 
 class ExtensionDisabledGlobalError
     : public GlobalErrorWithStandardBubble,
       public content::NotificationObserver,
       public extensions::ExtensionUninstallDialog::Delegate,
       public extensions::ExtensionRegistryObserver {
  public:
@@ skipping 348 matching lines @@
                                  content::WebContents* web_contents,
                                  const Extension* extension) {
   scoped_ptr<ExtensionInstallPrompt> install_ui(
       new ExtensionInstallPrompt(web_contents));
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(service, std::move(install_ui),
                                       extension);
 }
 
 }  // namespace extensions