[Mac] more browser_tests cleanup

- get extension_browsertests_misc compiling
- mark a bunch of tests with bugs and dependencies before they can come online
- bring a bunch of tests online (also on linux)

- Also removed some variables only used in one spot in the gyp file now.
- Update all the browser_tests to use the MAYBE_ pattern to make sure we never get a conflict on the define

BUG=none
TEST=waterfall stays green
Review URL: http://codereview.chromium.org/475008

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

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 32fe5b5..958bfb0 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -106,10 +106,12 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, Title) {
 
 #if defined(OS_MACOSX)
 // http://crbug.com//29424
-#define JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab
+#define MAYBE_JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab
+#else
+#define MAYBE_JavascriptAlertActivatesTab JavascriptAlertActivatesTab
 #endif
 
-IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) {
   GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
   ui_test_utils::NavigateToURL(browser(), url);
   browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED,
@@ -151,12 +153,14 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
 
 #if defined(OS_MACOSX)
 // http://crbug.com//29424
-#define ReloadThenCancelBeforeUnload DISABLED_ReloadThenCancelBeforeUnload
+#define MAYBE_ReloadThenCancelBeforeUnload DISABLED_ReloadThenCancelBeforeUnload
+#else
+#define MAYBE_ReloadThenCancelBeforeUnload 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.
-IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ReloadThenCancelBeforeUnload) {
   GURL url("data:text/html," + BEFORE_UNLOAD_HTML);
   ui_test_utils::NavigateToURL(browser(), url);