Makes tests either use mock compositor or mock WebGraphicsContext3D

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 24 matching lines @@
       ],
       'sources': [
         'compositor.cc',
         'compositor.h',
         'compositor_export.h',
         'compositor_gl.cc',
         'compositor_gl.h',
         'compositor_cc.cc',
         'compositor_cc.h',
         'compositor_observer.h',
+        'compositor_setup.h',
         'compositor_stub.cc',
         'compositor_switches.cc',
         'compositor_switches.h',
         'compositor_win.cc',
         'debug_utils.cc',
         'debug_utils.h',
         'layer.cc',
         'layer.h',
         'layer_animation_delegate.h',
         'layer_animation_element.cc',
@@ skipping 95 matching lines @@
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
-        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
         'layer_animation_sequence_unittest.cc',
         'layer_animator_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
         'test/test_compositor_host.h',
         'test/test_compositor_host_linux.cc',
         'test/test_compositor_host_mac.mm',
@@ skipping 11 matching lines @@
       ],
       'conditions': [
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
       ],
     },
-    {
-      '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',
-          ],
-        }],
-      ],
-    },
   ],
 }