Revert 269892 "linux_aura: Compile ash into chrome."

trunk/src/chrome/chrome_tests.gypi

Index: trunk/src/chrome/chrome_tests.gypi
===================================================================
--- trunk/src/chrome/chrome_tests.gypi	(revision 269901)
+++ trunk/src/chrome/chrome_tests.gypi	(working copy)
@@ -1792,20 +1792,10 @@
               ],
             }],
           ],
-        }, { # 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!': [
-            # 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.
+            # 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.
             'browser/chromeos/system/tray_accessibility_browsertest.cc',
             'browser/ui/ash/accelerator_commands_browsertest.cc',
             'browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc',
@@ -1814,6 +1804,13 @@
             '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': [