Move some non-unittest files to compositor_test_support

ui/compositor/compositor.gyp

Index: ui/compositor/compositor.gyp
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 9081e89107a2db9f96e170d744a4ecd73a0705f8..a149d666b29d150f419458207b565732e9c82f91 100644
--- a/ui/compositor/compositor.gyp
+++ b/ui/compositor/compositor.gyp
@@ -78,6 +78,7 @@
         '<(DEPTH)/cc/cc.gyp:cc',
         '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
@@ -87,18 +88,31 @@
         'compositor',
       ],
       'sources': [
+        'test/context_factories_for_test.cc',
+        'test/context_factories_for_test.h',
+        'test/default_context_factory.cc',
+        'test/default_context_factory.h',
         'test/draw_waiter_for_test.cc',
         'test/draw_waiter_for_test.h',
-        'test/test_layers.cc',
-        'test/test_layers.h',
+        'test/layer_animator_test_controller.cc',
+        'test/layer_animator_test_controller.h',
+        'test/test_compositor_host.h',
+        'test/test_compositor_host_mac.mm',
+        'test/test_compositor_host_ozone.cc',
+        'test/test_compositor_host_win.cc',
+        'test/test_compositor_host_x11.cc',
         'test/test_context_factory.cc',
         'test/test_context_factory.h',
-        'test/default_context_factory.cc',
-        'test/default_context_factory.h',
-        'test/context_factories_for_test.cc',
-        'test/context_factories_for_test.h',
+        'test/test_layer_animation_delegate.cc',
+        'test/test_layer_animation_delegate.h',
+        'test/test_layer_animation_observer.cc',
+        'test/test_layer_animation_observer.h',
+        'test/test_layers.cc',
+        'test/test_layers.h',
         'test/test_suite.cc',
         'test/test_suite.h',
+        'test/test_utils.cc',
+        'test/test_utils.h',
       ],
     },
     {
@@ -125,19 +139,6 @@
         'layer_animator_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
-        'test/layer_animator_test_controller.cc',
-        'test/layer_animator_test_controller.h',
-        'test/test_compositor_host.h',
-        'test/test_compositor_host_mac.mm',
-        'test/test_compositor_host_ozone.cc',
-        'test/test_compositor_host_win.cc',
-        'test/test_compositor_host_x11.cc',
-        'test/test_layer_animation_delegate.cc',
-        'test/test_layer_animation_delegate.h',
-        'test/test_layer_animation_observer.cc',
-        'test/test_layer_animation_observer.h',
-        'test/test_utils.cc',
-        'test/test_utils.h',
         'transform_animation_curve_adapter_unittest.cc',
       ],
       'conditions': [