| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index b7d430f8f3066e923dd0aff2357222ecfbbe4e06..36a21b91c7ff116db229319127dfe3a9bb7e67ac 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -1798,10 +1798,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',
|
| @@ -1810,13 +1820,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': [
|
|
|