[Mac] A chunk of browser_tests for extensions:

  - Bring up extension_apitest on mac
  - stub browser_action_apitest but get it compiling
  - stubs_apitest passes
  - compile cross_origin_xhr_apitest, but we don't pass it.
  - content_script_all_frames_apitest passes
  - execute_script_apitest passes

BUG=none
TEST=waterfall stays green

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

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

4 files changed, 15 insertions, 11 deletions

diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 2636b2f..4fa4c69 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -137,6 +137,13 @@ class BrowserActionTest : public ExtensionApiTest {
 #endif
 };
 
+#if defined(OS_MACOSX)
+// http://crbug.com/29709 port to Mac
+#define Basic DISABLED_Basic
+#define DynamicBrowserAction DISABLED_DynamicBrowserAction
+#define TabSpecificBrowserActionState DISABLED_TabSpecificBrowserActionState
+#endif
+
 IN_PROC_BROWSER_TEST_F(BrowserActionTest, Basic) {
   StartHTTPServer();
   ASSERT_TRUE(RunExtensionTest("browser_action")) << message_;
@@ -234,7 +241,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionTest, TabSpecificBrowserActionState) {
   EXPECT_EQ("hi!", GetTooltip(0));
 }
 
-// TODO(estade): port to Linux.
+// TODO(estade): http://crbug.com/29710 port to Mac & Linux
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(BrowserActionTest, BrowserActionPopup) {
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("popup")));
@@ -292,4 +299,4 @@ IN_PROC_BROWSER_TEST_F(BrowserActionTest, BrowserActionPopup) {
   browser_actions->HidePopup();
   EXPECT_TRUE(browser_actions->TestGetPopup() == NULL);
 }
-#endif
+#endif  // defined(OS_WIN)
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
index 5a98322..1986eba 100644
--- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc
+++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
@@ -4,6 +4,11 @@
 
 #include "chrome/browser/extensions/extension_apitest.h"
 
+#if defined(OS_MACOSX)
+// http://crbug.com/29711
+#define CrossOriginXHR DISABLED_CrossOriginXHR
+#endif
+
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHR) {
   host_resolver()->AddRule("*.com", "127.0.0.1");
   StartHTTPServer();
diff --git a/chrome/browser/extensions/stubs_apitest.cc b/chrome/browser/extensions/stubs_apitest.cc
index bdbf69c..091c9e3 100644
--- a/chrome/browser/extensions/stubs_apitest.cc
+++ b/chrome/browser/extensions/stubs_apitest.cc
@@ -6,7 +6,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/ui_test_utils.h"
 
-#if defined(OS_WIN)  // TODO(asargent) get this working on linux
 // Tests that we throw errors when you try using extension APIs that aren't
 // supported in content scripts.
 //
@@ -27,4 +26,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Stubs) {
   ResultCatcher catcher;
   ASSERT_TRUE(catcher.GetNextResult());
 }
-#endif
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 91578a1..32b8daa 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -24,12 +24,6 @@
       'browser/views/browser_views_accessibility_browsertest.cc',
     ],
     'browser_tests_sources_exclude_on_mac': [
-      'browser/extensions/browser_action_apitest.cc',
-      'browser/extensions/content_script_all_frames_apitest.cc',
-      'browser/extensions/cross_origin_xhr_apitest.cc',
-      'browser/extensions/execute_script_apitest.cc',
-      'browser/extensions/extension_apitest.cc',
-      'browser/extensions/extension_apitest.h',
       'browser/extensions/extension_bookmarks_apitest.cc',
       'browser/extensions/extension_history_apitest.cc',
       'browser/extensions/extension_javascript_url_apitest.cc',
@@ -38,8 +32,8 @@
       'browser/extensions/extension_override_apitest.cc',
       'browser/extensions/extension_toolstrip_apitest.cc',
       'browser/extensions/isolated_world_apitest.cc',
+      # Uses views headers
       'browser/extensions/page_action_apitest.cc',
-      'browser/extensions/stubs_apitest.cc',
     ],
     # TODO(jcampan): move these vars to views.gyp.
     'views_unit_tests_sources': [