Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index a9e4a35e2b5180bcf9d49a86d5c59263c173ed14..96880e3f2e4264b1f8fa0ff1097370cba03d446d 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -1803,10 +1803,20 @@ |
], |
}], |
], |
+ }, { # else: OS != "win" |
+ 'sources!': [ |
+ 'app/chrome_command_ids.h', |
+ 'app/chrome_dll.rc', |
+ 'app/chrome_dll_resource.h', |
+ 'app/chrome_version.rc.version', |
+ ], |
+ }], |
+ ['chromeos==0 and use_aura==1', { |
'sources!': [ |
- # use_aura currently sets use_ash on Windows. So take these tests out |
- # for win aura builds. |
- # TODO: enable these for win_ash browser tests. |
+ # On Windows and Linux, we currently don't support enough of the |
+ # ash environment to run these unit tests. |
+ # |
+ # TODO: enable these on windows and linux. |
'browser/chromeos/system/tray_accessibility_browsertest.cc', |
'browser/ui/ash/accelerator_commands_browsertest.cc', |
'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc', |
@@ -1815,13 +1825,6 @@ |
'browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc', |
'browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc', |
], |
- }, { # else: OS != "win" |
- 'sources!': [ |
- 'app/chrome_command_ids.h', |
- 'app/chrome_dll.rc', |
- 'app/chrome_dll_resource.h', |
- 'app/chrome_version.rc.version', |
- ], |
}], |
['OS=="linux"', { |
'dependencies': [ |