enabled one browser test and tag JavascriptAlertActivatesTab, ReloadThenCance...

chrome/browser/browser_browsertest.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 <string>
 
 #include "app/l10n_util.h"
 #include "base/sys_info.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog.h"
@@ skipping 86 matching lines @@
   ui_test_utils::NavigateToURL(browser(),
                                ui_test_utils::GetTestUrl(L".", L"title2.html"));
   const std::wstring test_title(L"Title Of Awesomeness");
   EXPECT_EQ(LocaleWindowCaptionFromPageTitle(test_title),
             UTF16ToWideHack(browser()->GetWindowTitleForCurrentTab()));
   string16 tab_title;
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), &tab_title));
   EXPECT_EQ(WideToUTF16(test_title), tab_title);
 }
 
-#if !defined(OS_MACOSX)
-// TODO(port): BUG16322
+#if defined(OS_MACOSX)
+// http://crbug.com//29424
+#define JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab
+#endif
+
 IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) {
   GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
   ui_test_utils::NavigateToURL(browser(), url);
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
                            true, 0, false, NULL);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(0, browser()->selected_index());
   TabContents* second_tab = browser()->GetTabContentsAt(1);
   ASSERT_TRUE(second_tab);
   second_tab->render_view_host()->ExecuteJavascriptInWebFrame(L"",
       L"alert('Activate!');");
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   alert->CloseModalDialog();
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
 }
-#endif  // !defined(OS_MACOSX)
 
 // Create 34 tabs and verify that a lot of processes have been created. The
 // exact number of processes depends on the amount of memory. Previously we
 // had a hard limit of 31 processes and this test is mainly directed at
 // verifying that we don't crash when we pass this limit.
 IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
   GURL url(ui_test_utils::GetTestUrl(L".", L"title2.html"));
 
   // There is one initial tab.
   for (int ix = 0; ix != 33; ++ix) {
     browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
                              true, 0, false, NULL);
   }
   EXPECT_EQ(34, browser()->tab_count());
 
   // See browser\renderer_host\render_process_host.cc for the algorithm to
   // decide how many processes to create.
   if (base::SysInfo::AmountOfPhysicalMemoryMB() >= 2048) {
     EXPECT_GE(CountRenderProcessHosts(), 24);
   } else {
     EXPECT_LE(CountRenderProcessHosts(), 23);
   }
 }
 
+#if defined(OS_MACOSX)
+// http://crbug.com//29424
+#define ReloadThenCancelBeforeUnload DISABLED_ReloadThenCancelBeforeUnload
+#endif
+
 // Test for crbug.com/22004.  Reloading a page with a before unload handler and
 // then canceling the dialog should not leave the throbber spinning.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ReloadThenCancelBeforeUnload) {
-#else
 IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) {
-#endif
   GURL url("data:text/html," + BEFORE_UNLOAD_HTML);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Navigate to another page, but click cancel in the dialog.  Make sure that
   // the throbber stops spinning.
   browser()->Reload();
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   alert->CloseModalDialog();
   EXPECT_FALSE(browser()->GetSelectedTabContents()->is_loading());
 
   // Clear the beforeunload handler so the test can easily exit.
   browser()->GetSelectedTabContents()->render_view_host()->
       ExecuteJavascriptInWebFrame(L"", L"onbeforeunload=null;");
 }
 
+#if defined(OS_MACOSX)
+// http://crbug.com//29424
+#define MAYBE_SingleBeforeUnloadAfterWindowClose DISABLED_SingleBeforeUnloadAfterWindowClose
+#else
+#define MAYBE_SingleBeforeUnloadAfterWindowClose FLAKY_SingleBeforeUnloadAfterWindowClose
+#endif
+
 // Test for crbug.com/11647.  A page closed with window.close() should not have
 // two beforeunload dialogs shown.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(BrowserTest,
-                       DISABLED_SingleBeforeUnloadAfterWindowClose) {
-#else
-IN_PROC_BROWSER_TEST_F(BrowserTest, FLAKY_SingleBeforeUnloadAfterWindowClose) {
-#endif
+IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) {
   browser()->GetSelectedTabContents()->render_view_host()->
       ExecuteJavascriptInWebFrame(L"", OPEN_NEW_BEFOREUNLOAD_PAGE);
 
   // Close the new window with JavaScript, which should show a single
   // beforeunload dialog.  Then show another alert, to make it easy to verify
   // that a second beforeunload dialog isn't shown.
   browser()->GetTabContentsAt(0)->render_view_host()->
       ExecuteJavascriptInWebFrame(L"", L"w.close(); alert('bar');");
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   alert->AcceptWindow();
@@ skipping 13 matching lines @@
   for (; !it.IsAtEnd(); it.Advance()) {
     base::TimeDelta renderer_td =
         it.GetCurrentValue()->get_child_process_idle_time();
     base::TimeDelta browser_td = base::TimeTicks::Now() - start;
     EXPECT_TRUE(browser_td >= renderer_td);
   }
 }
 
 // Test IDC_CREATE_SHORTCUTS command is enabled for url scheme file, ftp, http
 // and https and disabled for chrome://, about:// etc.
-#if defined(OS_MACOSX)
-IN_PROC_BROWSER_TEST_F(BrowserTest,
-                       DISABLED_CommandCreateAppShortcut) {
-#else
 IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcut) {
-#endif
   static const wchar_t kDocRoot[] = L"chrome/test/data";
 
   CommandUpdater* command_updater = browser()->command_updater();
 
   // Urls that are okay to have shortcuts.
   GURL file_url(ui_test_utils::GetTestUrl(L".", L"empty.html"));
   ASSERT_TRUE(file_url.SchemeIs(chrome::kFileScheme));
   ui_test_utils::NavigateToURL(browser(), file_url);
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
@@ skipping 31 matching lines @@
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
   GURL downloads_url(chrome::kChromeUIDownloadsURL);
   ui_test_utils::NavigateToURL(browser(), downloads_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 
   GURL blank_url(chrome::kAboutBlankURL);
   ui_test_utils::NavigateToURL(browser(), blank_url);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
 }