diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 02:06:33 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 02:06:33 +0000 |
| commit | 2a4d754e56ca9ed588201257b1e521d96b6aaa17 (patch) | |
| tree | 656d7ba03658f2e13464047a6159deabaa5d2ac5 /chrome/chrome_tests.gypi | |
| parent | cc9858559216b315ef95415396f612109c6ef5f3 (diff) | |
| download | chromium_src-2a4d754e56ca9ed588201257b1e521d96b6aaa17.zip chromium_src-2a4d754e56ca9ed588201257b1e521d96b6aaa17.tar.gz chromium_src-2a4d754e56ca9ed588201257b1e521d96b6aaa17.tar.bz2 | |
Don't keep a pointer to NaClBrokerHost in NaClBrokerService - use ChildProcessHost::Iterator instead. This change fixes the crash that occured if the browser was closed while the NaCl module was still running (found by nacl_ui_tests).
Also make nacl_ui_tests depend on nacl win64 binary (required to run the tests on Win64)
BUG=none
TEST=nacl_ui_tests
Review URL: http://codereview.chromium.org/875005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c809459..df5793d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -452,11 +452,9 @@ 'test/nacl/nacl_test.cc', ], 'conditions': [ - # TODO(gregoryd): This test will run on Windows only at first. - # Refer to ui_tests target above if any problems appear when trying - # to enable it on other platforms. ['OS=="win"', { 'dependencies': [ + 'chrome_nacl_win64', 'crash_service', # run time dependency 'security_tests', # run time dependency 'test_support_common', |