[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, 10 insertions, 6 deletions

diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 4fa4c69..b7a16ac 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -139,12 +139,16 @@ class BrowserActionTest : public ExtensionApiTest {
 
 #if defined(OS_MACOSX)
 // http://crbug.com/29709 port to Mac
-#define Basic DISABLED_Basic
-#define DynamicBrowserAction DISABLED_DynamicBrowserAction
-#define TabSpecificBrowserActionState DISABLED_TabSpecificBrowserActionState
+#define MAYBE_Basic DISABLED_Basic
+#define MAYBE_DynamicBrowserAction DISABLED_DynamicBrowserAction
+#define MAYBE_TabSpecificBrowserActionState DISABLED_TabSpecificBrowserActionState
+#else
+#define MAYBE_Basic Basic
+#define MAYBE_DynamicBrowserAction DynamicBrowserAction
+#define MAYBE_TabSpecificBrowserActionState TabSpecificBrowserActionState
 #endif
 
-IN_PROC_BROWSER_TEST_F(BrowserActionTest, Basic) {
+IN_PROC_BROWSER_TEST_F(BrowserActionTest, MAYBE_Basic) {
   StartHTTPServer();
   ASSERT_TRUE(RunExtensionTest("browser_action")) << message_;
 
@@ -185,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionTest, Basic) {
   ASSERT_TRUE(result);
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserActionTest, DynamicBrowserAction) {
+IN_PROC_BROWSER_TEST_F(BrowserActionTest, MAYBE_DynamicBrowserAction) {
   ASSERT_TRUE(RunExtensionTest("browser_action_no_icon")) << message_;
 
   // Test that there is a browser action in the toolbar and that it has no icon.
@@ -214,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionTest, DynamicBrowserAction) {
   // TODO(aa): Would be nice here to actually compare that the pixels change.
 }
 
-IN_PROC_BROWSER_TEST_F(BrowserActionTest, TabSpecificBrowserActionState) {
+IN_PROC_BROWSER_TEST_F(BrowserActionTest, MAYBE_TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action_tab_specific_state")) <<
       message_;