Reland r14146 which refactors DialogButton into cross platform

code.  This is the same as the last change except I renamed
class MessageBox to class MessageBoxFlags to avoid conflicting
with the same name in windows.h.

Review URL: http://codereview.chromium.org/87065

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14159 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index a0e5a24..fe394c4 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -136,9 +136,9 @@ class UnloadTest : public UITest {
     EXPECT_TRUE(CloseBrowser(browser.get(), &application_closed));
   }
 
-  void ClickModalDialogButton(views::DialogDelegate::DialogButton button) {
+  void ClickModalDialogButton(MessageBoxFlags::DialogButton button) {
     bool modal_dialog_showing = false;
-    views::DialogDelegate::DialogButton available_buttons;
+    MessageBoxFlags::DialogButton available_buttons;
     EXPECT_TRUE(automation()->WaitForAppModalDialog(3000));
     EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
         &available_buttons));
@@ -221,7 +221,7 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_OK);
+  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
   EXPECT_FALSE(IsBrowserRunning());
 }
@@ -233,12 +233,12 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_CANCEL);
+  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_CANCEL);
   WaitForBrowserClosed();
   EXPECT_TRUE(IsBrowserRunning());
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_OK);
+  ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
   EXPECT_FALSE(IsBrowserRunning());
 }