From 51a9ec43d16c0c7decd9ae286ca15359a709a4af Mon Sep 17 00:00:00 2001 From: "kkania@chromium.org" Date: Mon, 14 Dec 2009 21:42:57 +0000 Subject: Refactor browser action apitest and port for mac. BUG=29709 TEST=none Review URL: http://codereview.chromium.org/443013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34498 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/chrome_tests.gypi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'chrome/chrome_tests.gypi') diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 69b2d74..094e8af 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -5,6 +5,7 @@ { 'variables' : { 'browser_tests_sources_views_specific': [ + 'browser/extensions/browser_action_test_util_views.cc', 'browser/views/find_bar_host_browsertest.cc', ], 'browser_tests_sources_win_specific': [ @@ -1069,18 +1070,19 @@ 'browser/extensions/autoupdate_interceptor.cc', 'browser/extensions/autoupdate_interceptor.h', 'browser/extensions/browser_action_apitest.cc', + 'browser/extensions/browser_action_test_util.h', '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', - 'browser/extensions/extension_messages_apitest.cc', 'browser/extensions/extension_browsertest.cc', 'browser/extensions/extension_browsertest.h', 'browser/extensions/extension_browsertests_misc.cc', + 'browser/extensions/extension_history_apitest.cc', + 'browser/extensions/extension_javascript_url_apitest.cc', + 'browser/extensions/extension_messages_apitest.cc', 'browser/extensions/extension_override_apitest.cc', 'browser/extensions/extension_toolstrip_apitest.cc', 'browser/extensions/isolated_world_apitest.cc', @@ -1143,15 +1145,22 @@ }], ['OS=="linux" and toolkit_views==0', { 'sources': [ + 'browser/extensions/browser_action_test_util_gtk.cc', 'browser/gtk/view_id_util_browsertest.cc', ], }], ['OS=="mac"', { + 'sources': [ + 'browser/extensions/browser_action_test_util_mac.mm', + ], 'sources!': [ # This fails to compile because it seem to drag in views headers. # http://crbug.com/29895 'browser/extensions/page_action_apitest.cc', ], + 'include_dirs': [ + '../third_party/GTM', + ], # TODO(mark): We really want this for all non-static library # targets, but when we tried to pull it up to the common.gypi # level, it broke other things like the ui, startup, and -- cgit v1.1