Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
| index fed070ea06bae728c14c72ae11ac5a132bead14e..68dea1a7f25b9aacf8c98de5d7244711a493255c 100644 |
| --- a/chrome/chrome_tests.gypi |
| +++ b/chrome/chrome_tests.gypi |
| @@ -2157,6 +2157,15 @@ |
| '../build/linux/system.gyp:dbus', |
| '../ui/login/login.gyp:login_resources', |
| ], |
| + 'conditions': [ |
| + ['use_ozone==1', { |
| + 'sources!': [ |
| + # crbug.com/362698 |
|
wtc
2015/03/13 14:09:58
Since bug 362698 has been fixed, perhaps we can ru
kpschoedel
2015/03/13 15:39:57
Yes, good catch.
wtc
2015/03/13 17:43:55
Thanks for confirming. I re-enabled those two test
|
| + 'browser/chromeos/input_method/input_method_engine_browsertests.cc', |
| + 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc', |
| + ], |
| + }], |
| + ], |
| }, { # Non-ChromeOS |
| 'sources!': [ |
| 'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc', |
| @@ -2410,13 +2419,6 @@ |
| '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput', |
| ], |
| }], |
| - ['use_ozone==1', { |
| - 'sources!': [ |
| - # crbug.com/362698 |
| - 'browser/chromeos/input_method/input_method_engine_browsertests.cc', |
| - 'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc', |
| - ], |
| - }], |
| ['remoting==1', { |
| 'sources': [ '<@(chrome_browser_tests_remoting_sources)' ], |
| 'dependencies': [ |