summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 20:33:01 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-14 20:33:01 +0000
commitad834d2e31e1e7aece26910c12329535d1f2b6e0 (patch)
tree2ecb74b53ef032411a15851c681930fc1c45888e /chrome/chrome_tests.gypi
parent8bb7d838a762c049a046a87c119a2724a98a69ae (diff)
downloadchromium_src-ad834d2e31e1e7aece26910c12329535d1f2b6e0.zip
chromium_src-ad834d2e31e1e7aece26910c12329535d1f2b6e0.tar.gz
chromium_src-ad834d2e31e1e7aece26910c12329535d1f2b6e0.tar.bz2
Revert 59409 - GTTF: Move browser_tests test launcher timeout to chrome/test/test_timeouts
BUG=none TEST=browser_tests Review URL: http://codereview.chromium.org/3327023 TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3440002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 96b2fae..a1718f2 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2337,6 +2337,7 @@
'<(INTERMEDIATE_DIR)',
'<(protoc_out_dir)',
],
+ # TODO(phajdan.jr): Only temporary, to make transition easier.
'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
'sources': [
'app/chrome_dll.rc',