Fix up compositor mocking.

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 d4ce8d56c8e921e624ec7ac17b5bb2740dc0ea17..df3f7ac52ac1a050340c3e219a642ee04aa06ec0 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -107,7 +107,6 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/skia/skia.gyp:skia',
       ],
       'sources': [
         'compositor_test_support.cc',
@@ -120,21 +119,6 @@
               '<(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',
-          ],
-        }],
       ],
     },
     {
@@ -151,6 +135,7 @@
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
+        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
@@ -165,8 +150,6 @@
         'test_layer_animation_delegate.h',
         'test_suite.cc',
         'test_suite.h',
-        'test_texture.cc',
-        'test_texture.h',
         'test_utils.cc',
         'test_utils.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
@@ -186,5 +169,30 @@
         }],
       ],
     },
+    {
+      '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': [
+        ['toolkit_views == 1', {
+          'dependencies': [
+            '<(DEPTH)/skia/skia.gyp:skia',
+            'compositor',
+          ],
+          'sources': [
+            'test_compositor.cc',
+            'test_compositor.h',
+            'test_texture.cc',
+            'test_texture.h',
+          ],              
+        }],
+      ],
+    },
   ],
 }