Use a mocked compositor for unit tests

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 0b88f32feb27df62f5c62aa683275888d3c809af..e5a778581fefeecac00a526141a7472286bd5b56 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -100,8 +100,8 @@
       'target_name': 'compositor_test_support',
       'type': 'static_library',
       'dependencies': [
-        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
-        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/skia/skia.gyp:skia',
       ],
       'sources': [
         'compositor_test_support.cc',
@@ -111,8 +111,24 @@
         ['use_webkit_compositor == 1', {
             'dependencies': [
               '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
+              '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
             ],
         }],
+        ['views_compositor==1', {
+          'sources': [
+          'compositor.cc',

[piman, 2011/10/25 18:06:51]

Why are we compiling these twice? Also, won't we have a potential conflict if we
link both compositor and compositor_test_support? Wouldn't it make more sense to
depend on compositor?

[jonathan.backer, 2011/10/25 20:10:09]

The idea is to avoid pulling in the actual implementations. AFAIK, most of the
places where this is used, we're using a mock compositor. There are one or two
exceptions (aura_test_shell?) where it is used to initialize WK and use a real
compositor. These use cases depend on both compositor and
compositor_test_support.

I'd like to keep the separate, because it may be possible to lose the WK
dependency for test if we can get a test Layer implementation.

+          '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',
+          ],
+        }],
       ],
     },
     {
@@ -133,15 +149,11 @@
       'sources': [
         'layer_unittest.cc',
         'run_all_unittests.cc',
-        'test_compositor.cc',
-        'test_compositor.h',
         'test_compositor_host.h',
         'test_compositor_host_linux.cc',
         'test_compositor_host_win.cc',
         'test_suite.cc',
         'test_suite.h',
-        'test_texture.cc',
-        'test_texture.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],