summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 22:27:24 +0000
committerkkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 22:27:24 +0000
commit36a06bad9e883888e32e95bad815fcf89c00fb1c (patch)
tree70e0f640d412b76dcfb586a58ddaa16d2dcd4304 /chrome/chrome_tests.gypi
parent44af5beabc1f3c7e46e34711ab515a1d235ccbc0 (diff)
downloadchromium_src-36a06bad9e883888e32e95bad815fcf89c00fb1c.zip
chromium_src-36a06bad9e883888e32e95bad815fcf89c00fb1c.tar.gz
chromium_src-36a06bad9e883888e32e95bad815fcf89c00fb1c.tar.bz2
Revert 35737 (Chrome OS failing) - Include more extension browser tests on mac and linux. Some minor changes and reorganization.
BUG=none TEST=none Review URL: http://codereview.chromium.org/504064 TBR=kkania@chromium.org Review URL: http://codereview.chromium.org/518068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rwxr-xr-xchrome/chrome_tests.gypi14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 0f053b4..7eb8acbd 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -9,7 +9,14 @@
'browser/views/find_bar_host_browsertest.cc',
],
'browser_tests_sources_win_specific': [
+ 'browser/extensions/extension_devtools_browsertest.cc',
+ 'browser/extensions/extension_devtools_browsertest.h',
+ 'browser/extensions/extension_devtools_browsertests.cc',
'browser/extensions/extension_shelf_model_unittest.cc',
+ 'browser/extensions/extension_startup_unittest.cc',
+ 'browser/extensions/extension_storage_apitest.cc',
+ 'browser/extensions/extension_tabs_apitest.cc',
+ 'browser/extensions/extension_i18n_apitest.cc',
'browser/extensions/extension_popup_apitest.cc',
# TODO(jam): http://crbug.com/15101 These tests fail on Linux and Mac.
'browser/child_process_security_policy_browser_test.cc',
@@ -1100,17 +1107,10 @@
'browser/extensions/extension_browsertest.cc',
'browser/extensions/extension_browsertest.h',
'browser/extensions/extension_browsertests_misc.cc',
- 'browser/extensions/extension_devtools_browsertest.cc',
- 'browser/extensions/extension_devtools_browsertest.h',
- 'browser/extensions/extension_devtools_browsertests.cc',
'browser/extensions/extension_history_apitest.cc',
- 'browser/extensions/extension_i18n_apitest.cc',
'browser/extensions/extension_javascript_url_apitest.cc',
'browser/extensions/extension_messages_apitest.cc',
'browser/extensions/extension_override_apitest.cc',
- 'browser/extensions/extension_startup_unittest.cc',
- 'browser/extensions/extension_storage_apitest.cc',
- 'browser/extensions/extension_tabs_apitest.cc',
'browser/extensions/extension_toolstrip_apitest.cc',
'browser/extensions/incognito_noscript_apitest.cc',
'browser/extensions/isolated_world_apitest.cc',