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

chrome/browser/extensions/bundle_installer.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/bundle_installer.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 95 matching lines @@
                                  const std::string& authuser,
                                  const std::string& delegated_username,
                                  const BundleInstaller::ItemList& items)
     : approved_(false),
       browser_(browser),
       name_(name),
       icon_(icon),
       authuser_(authuser),
       delegated_username_(delegated_username),
       host_desktop_type_(browser->host_desktop_type()),
-      profile_(browser->profile()) {
+      profile_(browser->profile()),
+      weak_factory_(this) {
   BrowserList::AddObserver(this);
   for (size_t i = 0; i < items.size(); ++i) {
     items_[items[i].id] = items[i];
     items_[items[i].id].state = Item::STATE_PENDING;
   }
 }
 
 BundleInstaller::~BundleInstaller() {
   BrowserList::RemoveObserver(this);
 }
@@ skipping 136 matching lines @@
   PermissionSet empty;
   for (size_t i = 0; i < dummy_extensions_.size(); ++i) {
     // Using "permissions ? *permissions : PermissionSet()" tries to do a copy,
     // and doesn't compile. Use a more verbose, but compilable, workaround.
     permissions = PermissionSet::CreateUnion(
         permissions ? *permissions : empty,
         dummy_extensions_[i]->permissions_data()->active_permissions());
   }
 
   if (g_auto_approve_for_test == PROCEED) {
-    InstallUIProceed();
+    OnInstallPromptDone(ExtensionInstallPrompt::Result::ACCEPTED);
   } else if (g_auto_approve_for_test == ABORT) {
-    InstallUIAbort(true);
+    OnInstallPromptDone(ExtensionInstallPrompt::Result::USER_CANCELED);
   } else {
     Browser* browser = browser_;
     if (!browser) {
       // The browser that we got initially could have gone away during our
       // thread hopping.
       browser = chrome::FindLastActiveWithProfile(profile_, host_desktop_type_);
     }
     content::WebContents* web_contents = NULL;
     if (browser)
       web_contents = browser->tab_strip_model()->GetActiveWebContents();
     install_ui_.reset(new ExtensionInstallPrompt(web_contents));
     scoped_ptr<ExtensionInstallPrompt::Prompt> prompt;
     if (delegated_username_.empty()) {
       prompt.reset(new ExtensionInstallPrompt::Prompt(
           ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT));
     } else {
       prompt.reset(new ExtensionInstallPrompt::Prompt(
           ExtensionInstallPrompt::DELEGATED_BUNDLE_PERMISSIONS_PROMPT));
       prompt->set_delegated_username(delegated_username_);
     }
     prompt->set_bundle(this);
     install_ui_->ShowDialog(
-        this, nullptr, &icon_, std::move(prompt), std::move(permissions),
+        base::Bind(&BundleInstaller::OnInstallPromptDone,
+                   weak_factory_.GetWeakPtr()),
+        nullptr, &icon_, std::move(prompt), std::move(permissions),
         ExtensionInstallPrompt::GetDefaultShowDialogCallback());
   }
 }
 
 void BundleInstaller::ShowInstalledBubbleIfDone() {
   // We're ready to show the installed bubble when no items are pending.
   if (HasItemWithState(Item::STATE_PENDING))
     return;
 
   if (browser_)
@@ skipping 16 matching lines @@
 
 void BundleInstaller::OnWebstoreParseFailure(
     const std::string& id,
     WebstoreInstallHelper::Delegate::InstallHelperResultCode result_code,
     const std::string& error_message) {
   items_[id].state = Item::STATE_FAILED;
 
   ShowPromptIfDoneParsing();
 }
 
-void BundleInstaller::InstallUIProceed() {
-  approved_ = true;
-  approval_callback_.Run(APPROVED);
-}
+void BundleInstaller::OnInstallPromptDone(
+    ExtensionInstallPrompt::Result result) {
+  ApprovalState state = APPROVED;
+  if (result == ExtensionInstallPrompt::Result::ACCEPTED) {
+    approved_ = true;
+    state = APPROVED;
+  } else {
+    for (std::pair<const std::string, Item>& entry : items_)
+      entry.second.state = Item::STATE_FAILED;
 
-void BundleInstaller::InstallUIAbort(bool user_initiated) {
-  for (std::pair<const std::string, Item>& entry : items_)
-    entry.second.state = Item::STATE_FAILED;
-
-  approval_callback_.Run(user_initiated ? USER_CANCELED : APPROVAL_ERROR);
+    state = result == ExtensionInstallPrompt::Result::USER_CANCELED
+                ? USER_CANCELED
+                : APPROVAL_ERROR;
+  }
+  approval_callback_.Run(state);
 }
 
 void BundleInstaller::OnExtensionInstallSuccess(const std::string& id) {
   items_[id].state = Item::STATE_INSTALLED;
 
   ShowInstalledBubbleIfDone();
 }
 
 void BundleInstaller::OnExtensionInstallFailure(
     const std::string& id,
@@ skipping 11 matching lines @@
 
   ShowInstalledBubbleIfDone();
 }
 
 void BundleInstaller::OnBrowserRemoved(Browser* browser) {
   if (browser_ == browser)
     browser_ = nullptr;
 }
 
 }  // namespace extensions