TTF: Re-enable test that rely on ClickModalDialogButton since it is now...

chrome/browser/unload_uitest.cc

 // Copyright (c) 2006-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 "app/message_box_flags.h"
 #include "base/file_util.h"
 #include "base/platform_thread.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 148 matching lines @@
   void LoadUrlAndQuitBrowser(const std::string& html_content,
                              const std::wstring& expected_title = L"") {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     ASSERT_TRUE(browser.get());
     NavigateToDataURL(html_content, expected_title);
     bool application_closed = false;
     EXPECT_TRUE(CloseBrowser(browser.get(), &application_closed));
   }
 
   void ClickModalDialogButton(MessageBoxFlags::DialogButton button) {
-#if defined(OS_WIN) || defined(OS_LINUX)
     bool modal_dialog_showing = false;
     MessageBoxFlags::DialogButton available_buttons;
     EXPECT_TRUE(automation()->WaitForAppModalDialog());
     EXPECT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
         &available_buttons));
     ASSERT_TRUE(modal_dialog_showing);
     EXPECT_TRUE((button & available_buttons) != 0);
     EXPECT_TRUE(automation()->ClickAppModalDialogButton(button));
-#else
-    // TODO(port): port this function to Mac.
-    NOTIMPLEMENTED();
-#endif
   }
 };
 
 // Navigate to a page with an infinite unload handler.
 // Then two async crosssite requests to ensure
 // we don't get confused and think we're closing the tab.
 //
 // This test is flaky on the valgrind UI bots. http://crbug.com/39057
 TEST_F(UnloadTest, DISABLED_CrossSiteInfiniteUnloadAsync) {
   // Tests makes no sense in single-process mode since the renderer is hung.
@@ skipping 86 matching lines @@
 // Tests closing the browser on a page with no unload listeners registered.
 TEST_F(UnloadTest, BrowserCloseNoUnloadListeners) {
   LoadUrlAndQuitBrowser(NOLISTENERS_HTML, L"nolisteners");
 }
 
 // Tests closing the browser on a page with an unload listener registered.
 TEST_F(UnloadTest, BrowserCloseUnload) {
   LoadUrlAndQuitBrowser(UNLOAD_HTML, L"unload");
 }
 
-#if defined(OS_MACOSX)
-// ClickModalDialogButton doesn't work on Mac: http://crbug.com/45031
-#define MAYBE_BrowserCloseBeforeUnloadOK DISABLED_BrowserCloseBeforeUnloadOK
-#define MAYBE_BrowserCloseBeforeUnloadCancel \
-    DISABLED_BrowserCloseBeforeUnloadCancel
-#define MAYBE_BrowserCloseWithInnerFocusedFrame \
-    DISABLED_BrowserCloseWithInnerFocusedFrame
-#elif defined(OS_LINUX)
-#define MAYBE_BrowserCloseBeforeUnloadOK BrowserCloseBeforeUnloadOK
-#define MAYBE_BrowserCloseBeforeUnloadCancel BrowserCloseBeforeUnloadCancel
-// Fails sometimes on Linux valgrind.
-#define MAYBE_BrowserCloseWithInnerFocusedFrame \
-    FLAKY_BrowserCloseWithInnerFocusedFrame
-#else
-#define MAYBE_BrowserCloseWithInnerFocusedFrame \
-    BrowserCloseWithInnerFocusedFrame
-#define MAYBE_BrowserCloseBeforeUnloadOK BrowserCloseBeforeUnloadOK
-#define MAYBE_BrowserCloseBeforeUnloadCancel BrowserCloseBeforeUnloadCancel
-#endif
-
 // Tests closing the browser with a beforeunload handler and clicking
 // OK in the beforeunload confirm dialog.
-TEST_F(UnloadTest, MAYBE_BrowserCloseBeforeUnloadOK) {
+TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
 }
 
 // Tests closing the browser with a beforeunload handler and clicking
 // CANCEL in the beforeunload confirm dialog.
-TEST_F(UnloadTest, MAYBE_BrowserCloseBeforeUnloadCancel) {
+TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_CANCEL);
   // There's no real graceful way to wait for something _not_ to happen, so
   // we just wait a short period.
   CrashAwareSleep(500);
   ASSERT_TRUE(IsBrowserRunning());
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
   WaitForBrowserClosed();
 }
 
+#if defined(OS_LINUX)
+// Fails sometimes on Linux valgrind. http://crbug.com/32615
+#define MAYBE_BrowserCloseWithInnerFocusedFrame \
+    FLAKY_BrowserCloseWithInnerFocusedFrame
+#else
+#define MAYBE_BrowserCloseWithInnerFocusedFrame \
+    BrowserCloseWithInnerFocusedFrame
+#endif
+
 // Tests closing the browser and clicking OK in the beforeunload confirm dialog
 // if an inner frame has the focus.  See crbug.com/32615.
 TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, L"innerframewithfocus");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(MessageBoxFlags::DIALOGBUTTON_OK);
@@ skipping 104 matching lines @@
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_timeout_ms()));
   scoped_refptr<TabProxy> main_tab(browser->GetActiveTab());
   ASSERT_TRUE(main_tab.get());
   std::wstring main_title;
   EXPECT_TRUE(main_tab->GetTabTitle(&main_title));
   EXPECT_EQ(std::wstring(L"only_one_unload"), main_title);
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.