Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

ui/aura/aura.gyp

Index: ui/aura/aura.gyp
===================================================================
--- ui/aura/aura.gyp	(revision 113682)
+++ ui/aura/aura.gyp	(working copy)
@@ -60,6 +60,7 @@
       'dependencies': [
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:ui',
         'aura',
       ],
@@ -80,13 +81,6 @@
         'test/test_window_delegate.cc',
         'test/test_window_delegate.h',
       ],
-      'conditions': [
-        ['use_webkit_compositor==0', {
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'aura_demo',
@@ -122,6 +116,7 @@
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../gfx/gl/gl.gyp:gl',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
@@ -149,15 +144,6 @@
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
-        ['use_webkit_compositor==1', {
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:compositor',
-          ],
-        }, { # use_webkit_compositor!=1
-          'dependencies': [
-            '../gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
       ],
     },
   ],