Revert "Refactor DialogDelegate so the DialogButton enum is in cross platform"

This reverts commit r14146.

MessageBox is redefined to MessageBoxW by windows.  I need to rename the
class.

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


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14147 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 3a692be..a0e5a24 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(MessageBox::DialogButton button) {
+  void ClickModalDialogButton(views::DialogDelegate::DialogButton button) {
     bool modal_dialog_showing = false;
-    MessageBox::DialogButton available_buttons;
+    views::DialogDelegate::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(MessageBox::DIALOGBUTTON_OK);
+  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
   EXPECT_FALSE(IsBrowserRunning());
 }
@@ -233,12 +233,12 @@ TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBox::DIALOGBUTTON_CANCEL);
+  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_CANCEL);
   WaitForBrowserClosed();
   EXPECT_TRUE(IsBrowserRunning());
 
   CloseBrowserAsync(browser.get());
-  ClickModalDialogButton(MessageBox::DIALOGBUTTON_OK);
+  ClickModalDialogButton(views::DialogDelegate::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
   EXPECT_FALSE(IsBrowserRunning());
 }