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

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

 // Copyright 2014 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/ui/views/extensions/extension_install_dialog_view.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
+#include "chrome/browser/extensions/extension_install_prompt_test_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "chrome/common/extensions/extension_test_util.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/test_util.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using extensions::PermissionIDSet;
 using extensions::PermissionMessage;
 using extensions::PermissionMessages;
 
-// A simple delegate implementation that counts the number of times
-// |InstallUIProceed| and |InstallUIAbort| are called.
-class MockExtensionInstallPromptDelegate
-    : public ExtensionInstallPrompt::Delegate {
- public:
-  MockExtensionInstallPromptDelegate()
-      : proceed_count_(0),
-        abort_count_(0) {}
-
-  // ExtensionInstallPrompt::Delegate overrides.
-  void InstallUIProceed() override;
-  void InstallUIAbort(bool user_initiated) override;
-
-  int proceed_count() { return proceed_count_; }
-  int abort_count() { return abort_count_; }
-
- protected:
-  int proceed_count_;
-  int abort_count_;
-};
-
-void MockExtensionInstallPromptDelegate::InstallUIProceed() {
-  ++proceed_count_;
-}
-
-void MockExtensionInstallPromptDelegate::InstallUIAbort(bool user_initiated) {
-  ++abort_count_;
-}
-
 class ExtensionInstallDialogViewTestBase : public ExtensionBrowserTest {
  protected:
   explicit ExtensionInstallDialogViewTestBase(
       ExtensionInstallPrompt::PromptType prompt_type);
   ~ExtensionInstallDialogViewTestBase() override {}
 
   void SetUpOnMainThread() override;
 
   // Creates and returns an install prompt of |prompt_type_|, optionally setting
   // |permissions|.
   scoped_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt();
   scoped_ptr<ExtensionInstallPrompt::Prompt> CreatePrompt(
       const PermissionMessages& permissions);
 
   content::WebContents* web_contents() { return web_contents_; }
-  MockExtensionInstallPromptDelegate* delegate() { return &delegate_; }
 
  private:
   const extensions::Extension* extension_;
   ExtensionInstallPrompt::PromptType prompt_type_;
   content::WebContents* web_contents_;
-  MockExtensionInstallPromptDelegate delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstallDialogViewTestBase);
 };
 
 ExtensionInstallDialogViewTestBase::ExtensionInstallDialogViewTestBase(
     ExtensionInstallPrompt::PromptType prompt_type)
     : extension_(NULL), prompt_type_(prompt_type), web_contents_(NULL) {}
 
 void ExtensionInstallDialogViewTestBase::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
@@ skipping 30 matching lines @@
 };
 
 ScrollbarTest::ScrollbarTest()
     : ExtensionInstallDialogViewTestBase(
           ExtensionInstallPrompt::PERMISSIONS_PROMPT) {
 }
 
 bool ScrollbarTest::IsScrollbarVisible(
     scoped_ptr<ExtensionInstallPrompt::Prompt> prompt) {
   ExtensionInstallDialogView* dialog = new ExtensionInstallDialogView(
-      profile(), web_contents(), delegate(), std::move(prompt));
+      profile(), web_contents(), ExtensionInstallPrompt::DoneCallback(),
+      std::move(prompt));
 
   // Create the modal view around the install dialog view.
   views::Widget* modal = constrained_window::CreateBrowserModalDialogViews(
       dialog, web_contents()->GetTopLevelNativeWindow());
   modal->Show();
   content::RunAllBlockingPoolTasksUntilIdle();
 
   // Check if the vertical scrollbar is visible.
   return dialog->scroll_view()->vertical_scroll_bar()->visible();
 }
@@ skipping 37 matching lines @@
   ~ExtensionInstallDialogViewTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstallDialogViewTest);
 };
 
 // Verifies that the delegate is notified when the user selects to accept or
 // cancel the install.
 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogViewTest, NotifyDelegate) {
   {
-    // The user confirms the install.
-    MockExtensionInstallPromptDelegate delegate;
+    ExtensionInstallPromptTestHelper helper;
     scoped_ptr<ExtensionInstallDialogView> dialog(
-        new ExtensionInstallDialogView(profile(), web_contents(), &delegate,
+        new ExtensionInstallDialogView(profile(), web_contents(),
+                                       helper.GetCallback(),
                                        CreatePrompt()));
     views::DialogDelegateView* delegate_view = dialog.get();
 
     delegate_view->Accept();
     delegate_view->OnClosed();
     dialog.reset();
 
-    EXPECT_EQ(0, delegate.abort_count());
-    EXPECT_EQ(1, delegate.proceed_count());
+    EXPECT_EQ(ExtensionInstallPrompt::Result::ACCEPTED, helper.result());
   }
 
   {
     // The user cancels the install.
-    MockExtensionInstallPromptDelegate delegate;
+    ExtensionInstallPromptTestHelper helper;
     scoped_ptr<ExtensionInstallDialogView> dialog(
-        new ExtensionInstallDialogView(profile(), web_contents(), &delegate,
+        new ExtensionInstallDialogView(profile(), web_contents(),
+                                       helper.GetCallback(),
                                        CreatePrompt()));
     views::DialogDelegateView* delegate_view = dialog.get();
 
     delegate_view->Cancel();
     delegate_view->OnClosed();
     dialog.reset();
 
-    EXPECT_EQ(1, delegate.abort_count());
-    EXPECT_EQ(0, delegate.proceed_count());
+    EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, helper.result());
   }
 
   {
     // Corner case: Dialog is closed without the user explicitly choosing to
     // proceed or cancel.
-    MockExtensionInstallPromptDelegate delegate;
+    ExtensionInstallPromptTestHelper helper;
     scoped_ptr<ExtensionInstallDialogView> dialog(
-        new ExtensionInstallDialogView(profile(), web_contents(), &delegate,
+        new ExtensionInstallDialogView(profile(), web_contents(),
+                                       helper.GetCallback(),
                                        CreatePrompt()));
     dialog.reset();
 
-    EXPECT_EQ(1, delegate.abort_count());
-    EXPECT_EQ(0, delegate.proceed_count());
+    // TODO(devlin): Should this be ABORTED?
+    EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, helper.result());
   }
 }