Convert JavascriptAlertActivatesTab to browser_tests framework.

chrome/browser/app_modal_dialog.cc

 // Copyright (c) 2009 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/app_modal_dialog.h"
 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
@@ skipping 32 matching lines @@
 
   if (type == NotificationType::TAB_CONTENTS_DESTROYED &&
       Source<TabContents>(source).ptr() ==
       static_cast<TabContents*>(tab_contents_))
     tab_contents_ = NULL;
 
   if (!tab_contents_)
     CloseModalDialog();
 }
 
+void AppModalDialog::SendCloseNotification() {
+  NotificationService::current()->Notify(
+      NotificationType::APP_MODAL_DIALOG_CLOSED,
+      Source<AppModalDialog>(this),
+      NotificationService::NoDetails());
+}
+
 void AppModalDialog::InitNotifications() {
   // Make sure we get navigation notifications so we know when our parent
   // contents will disappear or navigate to a different page.
   registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
                  NotificationService::AllSources());
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
 }
 
 void AppModalDialog::ShowModalDialog() {
   // If the TabContents that created this dialog navigated away before this
   // dialog became visible, simply show the next dialog if any.
   if (!tab_contents_) {
     Singleton<AppModalDialogQueue>()->ShowNextDialog();
     delete this;
     return;
   }
 
   tab_contents_->Activate();
   CreateAndShowDialog();
+
+  NotificationService::current()->Notify(
+      NotificationType::APP_MODAL_DIALOG_SHOWN,
+      Source<AppModalDialog>(this),
+      NotificationService::NoDetails());
 }
 
 void AppModalDialog::OnCancel() {
   // We need to do this before WM_DESTROY (WindowClosing()) as any parent frame
   // will receive it's activation messages before this dialog receives
   // WM_DESTROY. The parent frame would then try to activate any modal dialogs
   // that were still open in the ModalDialogQueue, which would send activation
   // back to this one. The framework should be improved to handle this, so this
   // is a temporary workaround.
   Singleton<AppModalDialogQueue>()->ShowNextDialog();
 
   if (tab_contents_) {
     tab_contents_->OnJavaScriptMessageBoxClosed(reply_msg_, false,
                                                 std::wstring());
   }
+
+  SendCloseNotification();
 }
 
 void AppModalDialog::OnAccept(const std::wstring& prompt_text,
                               bool suppress_js_messages) {
   Singleton<AppModalDialogQueue>()->ShowNextDialog();
 
   if (tab_contents_) {
     tab_contents_->OnJavaScriptMessageBoxClosed(reply_msg_, true,
                                                 prompt_text);
 
     if (suppress_js_messages)
       tab_contents()->set_suppress_javascript_messages(true);
   }
+
+  SendCloseNotification();
 }
 
 void AppModalDialog::OnClose() {
- if (tab_contents_) {
-   tab_contents_->OnJavaScriptMessageBoxWindowDestroyed();
- }
+  if (tab_contents_) {
+    tab_contents_->OnJavaScriptMessageBoxWindowDestroyed();
+  }
+
+  SendCloseNotification();
 }