Revert 107563 - Fix up compositor mocking.

ui/gfx/compositor/compositor.gyp

Index: ui/gfx/compositor/compositor.gyp
===================================================================
--- ui/gfx/compositor/compositor.gyp	(revision 107563)
+++ ui/gfx/compositor/compositor.gyp	(working copy)
@@ -107,6 +107,7 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/skia/skia.gyp:skia',
       ],
       'sources': [
         'compositor_test_support.cc',
@@ -119,6 +120,21 @@
               '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
             ],
         }],
+        ['views_compositor==1', {
+          'sources': [
+          'compositor.cc',
+          'compositor.h',
+          'layer.cc',
+          'layer.h',
+          'layer_animator.cc',
+          'layer_animator.h',
+          'layer_animator_delegate.h',
+          'test_compositor.cc',
+          'test_compositor.h',
+          'test_texture.cc',
+          'test_texture.h',
+          ],
+        }],
       ],
     },
     {
@@ -135,7 +151,6 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
-        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
@@ -171,30 +186,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': [
-        ['views_compositor == 1', {
-          'dependencies': [
-            '<(DEPTH)/skia/skia.gyp:skia',
-            'compositor',
-          ],
-          'sources': [
-            'test_compositor.cc',
-            'test_compositor.h',
-            'test_texture.cc',
-            'test_texture.h',
-          ],              
-        }],
-      ],
-    },
   ],
 }