Componentize app_modal_dialog

chrome/browser/lifetime/browser_close_manager_browsertest.cc

Index: chrome/browser/lifetime/browser_close_manager_browsertest.cc
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index 28e4d6e81685cb6633fc0d6c87f73ee1f1602cdb..fffd803fd2a070b6f71bb132c6add2099ff36c41 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -21,8 +21,6 @@
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"
-#include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_iterator.h"
@@ -32,6 +30,8 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
+#include "components/app_modal_dialogs/native_app_modal_dialog.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
@@ -54,9 +54,7 @@ class AppModalDialogObserver {
   AppModalDialogObserver() {}
 
   void Start() {
-    observer_.reset(new content::WindowedNotificationObserver(
-        chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
-        content::NotificationService::AllSources()));
+    waiter_ = ui_test_utils::CreateAppModalDialogWaiter();
   }
 
   void AcceptClose() {
@@ -73,23 +71,18 @@ class AppModalDialogObserver {
 
  private:
   NativeAppModalDialog* GetNextDialog() {
-    DCHECK(observer_);
-    observer_->Wait();
-    if (observer_->source() == content::NotificationService::AllSources())
-      return NULL;
-
-    AppModalDialog* dialog =
-        content::Source<AppModalDialog>(observer_->source()).ptr();
+    DCHECK(waiter_.get());
+    AppModalDialog* dialog = waiter_->Wait();
     EXPECT_TRUE(dialog->IsJavaScriptModalDialog());
     JavaScriptAppModalDialog* js_dialog =
         static_cast<JavaScriptAppModalDialog*>(dialog);
-    observer_.reset(new content::WindowedNotificationObserver(
-        chrome::NOTIFICATION_APP_MODAL_DIALOG_SHOWN,
-        content::NotificationService::AllSources()));
+    // Reset before creation because only one instance of the waiter is allowd.
+    waiter_.reset();
+    waiter_ = ui_test_utils::CreateAppModalDialogWaiter();
     return js_dialog->native_dialog();
   }
 
-  scoped_ptr<content::WindowedNotificationObserver> observer_;
+  scoped_ptr<AppModalDialogWaiter> waiter_;
 
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogObserver);
 };