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..77b1a20f5284139078de233bca9015a72e045372 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -56,6 +56,10 @@
         'layer_animation_sequence.h',
         'layer_animator.cc',
         'layer_animator.h',
+        'test_compositor.cc',

[sky, 2011/10/26 15:36:15]

Why are we compiling these all the time? Shouldn't they only be there for tests?

[jonathan.backer, 2011/10/26 15:58:33]

Mostly being expedient.

The previous GYP setup was flawed in that had .cc files in two different targets
(compositor and compositor_test_support). I could have a new target for
test_compositor that depends on compositor.

Another complication is that test_compositor and compositor_test_support need to
be usable independently (sometimes we want the test_compositor without the
compositor_test_support).

So in short, if I separate I need an additional target: compositor,
test_compositor, and compositor_test_support. I thought it was getting a bit
much.

+        'test_compositor.h',
+        'test_texture.cc',
+        'test_texture.h',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac"', {
@@ -106,8 +110,7 @@
       'target_name': 'compositor_test_support',
       'type': 'static_library',
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/skia/skia.gyp:skia',
+        'compositor',
       ],
       'sources': [
         'compositor_test_support.cc',
@@ -120,21 +123,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',
-          ],
-        }],
       ],
     },
     {
@@ -149,7 +137,6 @@
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
-        'compositor',
         'compositor_test_support',
       ],
       'sources': [