Attempt 2 at : Makes tests either use mock compositor or mock

ui/gfx/compositor/compositor.gyp

Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index f5c6f358007e6f17f3e23bc0204c481a3b828806..2c3ae4672dabdaebd5b26c90613ac226295c5cd9 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -42,6 +42,7 @@
         'compositor_cc.cc',
         'compositor_cc.h',
         'compositor_observer.h',
+        'compositor_setup.h',
         'compositor_stub.cc',
         'compositor_switches.cc',
         'compositor_switches.h',
@@ -107,6 +108,7 @@
             'sources!': [
               'compositor_cc.cc',
               'compositor_cc.h',
+              'compositor_setup.h',
               'test_web_graphics_context_3d.cc',
               'test_web_graphics_context_3d.h',
             ],
@@ -157,7 +159,6 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
-        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
@@ -187,6 +188,11 @@
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
+        ['use_webkit_compositor==0', {
+          'dependencies': [
+            'test_compositor',
+          ],
+        }],
       ],
     },
     {