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

chrome/browser/extensions/webstore_inline_installer_browsertest.cc

 // Copyright 2013 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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
@@ skipping 46 matching lines @@
             kAppDomain,
             kNonAppDomain) {}
 };
 
 class ProgrammableInstallPrompt : public ExtensionInstallPrompt {
  public:
   explicit ProgrammableInstallPrompt(WebContents* contents)
       : ExtensionInstallPrompt(contents)
   {}
 
-  ~ProgrammableInstallPrompt() override {}
+  ~ProgrammableInstallPrompt() override { g_done_callback = nullptr; }
 
   void ShowDialog(
-      Delegate* delegate,
+      const ExtensionInstallPrompt::DoneCallback& done_callback,
       const Extension* extension,
       const SkBitmap* icon,
       scoped_ptr<ExtensionInstallPrompt::Prompt> prompt,
       scoped_ptr<const extensions::PermissionSet> custom_permissions,
-      const ShowDialogCallback& callback) override {
-    delegate_ = delegate;
+      const ShowDialogCallback& show_dialog_callback) override {
+    done_callback_ = done_callback;
+    g_done_callback = &done_callback_;
   }
 
-  static bool Ready() {
-    return delegate_ != NULL;
-  }
+  static bool Ready() { return g_done_callback != nullptr; }
 
   static void Accept() {
-    delegate_->InstallUIProceed();
+    g_done_callback->Run(ExtensionInstallPrompt::Result::ACCEPTED);
   }
 
   static void Reject() {
-    delegate_->InstallUIAbort(true);
+    g_done_callback->Run(ExtensionInstallPrompt::Result::USER_CANCELED);
   }
 
  private:
-  static Delegate* delegate_;
+  static ExtensionInstallPrompt::DoneCallback* g_done_callback;
+
+  ExtensionInstallPrompt::DoneCallback done_callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProgrammableInstallPrompt);

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

You know.

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

Done.

 };
 
-ExtensionInstallPrompt::Delegate* ProgrammableInstallPrompt::delegate_;
+ExtensionInstallPrompt::DoneCallback*
+    ProgrammableInstallPrompt::g_done_callback = nullptr;
 
 // Fake inline installer which creates a programmable prompt in place of
 // the normal dialog UI.
 class WebstoreInlineInstallerForTest : public WebstoreInlineInstaller {
  public:
   WebstoreInlineInstallerForTest(WebContents* contents,
                                  content::RenderFrameHost* host,
                                  const std::string& extension_id,
                                  const GURL& requestor_url,
                                  const Callback& callback)
@@ skipping 220 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest,
                        DownloadProgressListenerTest) {
   RunTest("download_progress_listener.html");
 }
 
 IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallerListenerTest, BothListenersTest) {
   RunTest("both_listeners.html");
 }
 
 }  // namespace extensions