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

chrome/browser/extensions/api/permissions/permissions_api.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/api/permissions/permissions_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
 #include "chrome/browser/extensions/extension_management.h"
@@ skipping 123 matching lines @@
 }
 
 // static
 void PermissionsRequestFunction::SetIgnoreUserGestureForTests(
     bool ignore) {
   ignore_user_gesture_for_tests = ignore;
 }
 
 PermissionsRequestFunction::PermissionsRequestFunction() {}
 
-void PermissionsRequestFunction::InstallUIProceed() {
-  PermissionsUpdater perms_updater(GetProfile());
-  perms_updater.AddPermissions(extension(), *requested_permissions_);
-
-  results_ = Request::Results::Create(true);
-  SendResponse(true);
-
-  Release();  // Balanced in RunAsync().
-}
-
-void PermissionsRequestFunction::InstallUIAbort(bool user_initiated) {
-  SendResponse(true);
-
-  Release();  // Balanced in RunAsync().
-}
-
 PermissionsRequestFunction::~PermissionsRequestFunction() {}
 
 bool PermissionsRequestFunction::RunAsync() {
   results_ = Request::Results::Create(false);
 
   if (!user_gesture() &&
       !ignore_user_gesture_for_tests &&
       extension_->location() != Manifest::COMPONENT) {
     error_ = kUserGestureRequiredError;
     return false;
@@ skipping 50 matching lines @@
 
   // Filter out the granted permissions so we only prompt for new ones.
   requested_permissions_ =
       PermissionSet::CreateDifference(*requested_permissions_, *granted);
 
   // Filter out the active permissions.
   requested_permissions_ = PermissionSet::CreateDifference(
       *requested_permissions_,
       extension()->permissions_data()->active_permissions());
 
-  AddRef();  // Balanced in InstallUIProceed() / InstallUIAbort().
+  AddRef();  // Balanced in OnInstallPromptDone().
 
   // We don't need to show the prompt if there are no new warnings, or if
   // we're skipping the confirmation UI. All extension types but INTERNAL
   // are allowed to silently increase their permission level.
   const PermissionMessageProvider* message_provider =
       PermissionMessageProvider::Get();
   bool has_no_warnings =
       message_provider->GetPermissionMessages(
                           message_provider->GetAllPermissionIDs(
                               *requested_permissions_, extension()->GetType()))
           .empty();
   if (auto_confirm_for_tests == PROCEED || has_no_warnings ||
       extension_->location() == Manifest::COMPONENT) {
-    InstallUIProceed();
+    OnInstallPromptDone(ExtensionInstallPrompt::Result::ACCEPTED);
   } else if (auto_confirm_for_tests == ABORT) {
     // Pretend the user clicked cancel.
-    InstallUIAbort(true);
+    OnInstallPromptDone(ExtensionInstallPrompt::Result::USER_CANCELED);
   } else {
     CHECK_EQ(DO_NOT_SKIP, auto_confirm_for_tests);
     install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents()));
     install_ui_->ShowDialog(
-        this, extension(), nullptr,
+        base::Bind(&PermissionsRequestFunction::OnInstallPromptDone, this),
+        extension(), nullptr,
         make_scoped_ptr(new ExtensionInstallPrompt::Prompt(
             ExtensionInstallPrompt::PERMISSIONS_PROMPT)),
         requested_permissions_->Clone(),
         ExtensionInstallPrompt::GetDefaultShowDialogCallback());
   }
 
   return true;
 }
 
+void PermissionsRequestFunction::OnInstallPromptDone(
+    ExtensionInstallPrompt::Result result) {
+  if (result == ExtensionInstallPrompt::Result::ACCEPTED) {
+    PermissionsUpdater perms_updater(GetProfile());
+    perms_updater.AddPermissions(extension(), *requested_permissions_);
+
+    results_ = Request::Results::Create(true);
+  }
+
+  SendResponse(true);
+  Release();  // Balanced in RunAsync().
+}
+
 }  // namespace extensions