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 d5e38b717cc5be34cd43db7c999aee139040bcc7..8267fed8ee40febc0dd1f3e634aa8bf243494a05 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -80,6 +80,47 @@
       ],
     },
     {
+      'target_name': 'test_compositor',
+      'type': 'static_library',
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+      ],
+      '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',
+	'../test/gfx_test_utils.cc',
+	'../test/gfx_test_utils.h',
+      ],
+      'conditions': [
+        ['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',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
@@ -92,19 +133,16 @@
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
+	'test_compositor',
       ],
       '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',
       ],