Makes tests either use mock compositor or mock WebGraphicsContext3D

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..6bb6558bd29098a313033124f310f92eba97d492 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',
@@ -157,7 +158,6 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
-        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
@@ -189,32 +189,5 @@
         }],
       ],
     },
-    {
-      'target_name': 'test_compositor',
-      'type': 'static_library',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'sources': [
-        '../test/gfx_test_utils.cc',
-        '../test/gfx_test_utils.h',
-      ],
-      'conditions': [
-        # We allow on platforms without a compositor (such as OS_WIN).
-        # They will use compositor_stub.cc.
-        ['toolkit_views == 1', {
-          'dependencies': [
-            '<(DEPTH)/skia/skia.gyp:skia',
-            'compositor',
-          ],
-          'sources': [
-            'test/test_compositor.cc',
-            'test/test_compositor.h',
-            'test/test_texture.cc',
-            'test/test_texture.h',
-          ],
-        }],
-      ],
-    },
   ],
 }