cleanup: make WidgetClosingObserver as test support

chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc

 // Copyright 2016 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/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/passwords/account_chooser_dialog_view.h"
 #include "chrome/browser/ui/views/passwords/auto_signin_first_run_dialog_view.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 
 using ::testing::Field;
 
 namespace {
 
 // A helper class that will create FakeURLFetcher and record the requested URLs.
 class TestURLFetcherCallback {
  public:
   std::unique_ptr<net::FakeURLFetcher> CreateURLFetcher(
       const GURL& url,
       net::URLFetcherDelegate* d,
       const std::string& response_data,
       net::HttpStatusCode response_code,
       net::URLRequestStatus::Status status) {
     OnRequestDone(url);
     return std::unique_ptr<net::FakeURLFetcher>(
         new net::FakeURLFetcher(url, d, response_data, response_code, status));
   }
 
   MOCK_METHOD1(OnRequestDone, void(const GURL&));
 };
 
-// A Widget observer class used to observe bubbles closing.
-class BubbleCloseObserver : public views::WidgetObserver {
- public:
-  explicit BubbleCloseObserver(views::DialogDelegateView* bubble);
-  ~BubbleCloseObserver() override;
-
-  bool widget_closed() const { return !widget_; }
-
- private:
-  // WidgetObserver:
-  void OnWidgetClosing(views::Widget* widget) override;
-
-  views::Widget* widget_;
-
-  DISALLOW_COPY_AND_ASSIGN(BubbleCloseObserver);
-};
-
-BubbleCloseObserver::BubbleCloseObserver(views::DialogDelegateView* bubble)
-    : widget_(bubble->GetWidget()) {
-  widget_->AddObserver(this);
-}
-
-BubbleCloseObserver::~BubbleCloseObserver() {
-  if (widget_)
-    widget_->RemoveObserver(this);
-}
-
-void BubbleCloseObserver::OnWidgetClosing(views::Widget* widget) {
-  DCHECK_EQ(widget_, widget);
-  widget_->RemoveObserver(this);
-  widget_ = nullptr;
-}
-
 // ManagePasswordsUIController subclass to capture the dialog instance
 class TestManagePasswordsUIController : public ManagePasswordsUIController {
  public:
   explicit TestManagePasswordsUIController(content::WebContents* web_contents);
 
   void OnDialogHidden() override;
   AccountChooserPrompt* CreateAccountChooser(
       PasswordDialogController* controller) override;
   AutoSigninFirstRunPrompt* CreateAutoSigninPrompt(
       PasswordDialogController* controller) override;
@@ skipping 124 matching lines @@
   local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
   GURL icon_url("https://google.com/icon.png");
   form.icon_url = icon_url;
   form.display_name = base::ASCIIToUTF16("Peter Pan");
   form.federation_origin = url::Origin(GURL("https://google.com/federation"));
   local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
 
   // Prepare to capture the network request.
   TestURLFetcherCallback url_callback;
   net::FakeURLFetcherFactory factory(
-      NULL, base::Bind(&TestURLFetcherCallback::CreateURLFetcher,
-                       base::Unretained(&url_callback)));
+      nullptr, base::Bind(&TestURLFetcherCallback::CreateURLFetcher,
+                          base::Unretained(&url_callback)));
   factory.SetFakeResponse(icon_url, std::string(), net::HTTP_OK,
                           net::URLRequestStatus::FAILED);
   EXPECT_CALL(url_callback, OnRequestDone(icon_url));
 
   SetupChooseCredentials(std::move(local_credentials), origin);
   ASSERT_TRUE(controller()->current_account_chooser());
   AccountChooserDialogView* dialog = controller()->current_account_chooser();
   EXPECT_CALL(*this, OnChooseCredential(nullptr));
   EXPECT_CALL(*controller(), OnDialogClosed());
   dialog->GetWidget()->Close();
@@ skipping 60 matching lines @@
   autofill::PasswordForm form;
   form.origin = origin;
   form.display_name = base::ASCIIToUTF16("Peter");
   form.username_value = base::ASCIIToUTF16("peter@pan.test");
   local_credentials.push_back(base::MakeUnique<autofill::PasswordForm>(form));
 
   SetupChooseCredentials(std::move(local_credentials), origin);
 
   EXPECT_TRUE(controller()->current_account_chooser());
   views::DialogDelegateView* dialog = controller()->current_account_chooser();
-  BubbleCloseObserver bubble_observer(dialog);
+  views::test::WidgetClosingObserver bubble_observer(dialog->GetWidget());
   EXPECT_CALL(*this, OnChooseCredential(testing::Pointee(form)));
   dialog->Accept();
   EXPECT_TRUE(bubble_observer.widget_closed());
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest,
                        PopupAccountChooserWithSingleCredentialReturnNonEmpty) {
   GURL origin("https://example.com");
   std::vector<std::unique_ptr<autofill::PasswordForm>> local_credentials;
   autofill::PasswordForm form;
@@ skipping 85 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PasswordDialogViewTest, PopupAutoSigninPrompt) {
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
   controller()->OnPromptEnableAutoSignin();
   ASSERT_TRUE(controller()->current_autosignin_prompt());
   EXPECT_EQ(password_manager::ui::INACTIVE_STATE, controller()->GetState());
   AutoSigninFirstRunDialogView* dialog =
       controller()->current_autosignin_prompt();
-  BubbleCloseObserver bubble_observer(dialog);
+  views::test::WidgetClosingObserver bubble_observer(dialog->GetWidget());
   ui::Accelerator esc(ui::VKEY_ESCAPE, 0);
   EXPECT_CALL(*controller(), OnDialogClosed());
   EXPECT_TRUE(dialog->GetWidget()->client_view()->AcceleratorPressed(esc));
   EXPECT_TRUE(bubble_observer.widget_closed());
   content::RunAllPendingInMessageLoop();
   testing::Mock::VerifyAndClearExpectations(controller());
   EXPECT_TRUE(
       password_bubble_experiment::ShouldShowAutoSignInPromptFirstRunExperience(
           browser()->profile()->GetPrefs()));
 }
@@ skipping 76 matching lines @@
   RunDialog();
 }
 
 IN_PROC_BROWSER_TEST_F(
     PasswordDialogViewTest,
     InvokeDialog_PopupAccountChooserWithSingleCredentialClickSignIn) {
   RunDialog();
 }
 
 }  // namespace