Move some non-unittest files to compositor_test_support

ui/compositor/compositor.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 60 matching lines @@
       ],
     },
     {
       'target_name': 'compositor_test_support',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(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',
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
         '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/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/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_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_suite.cc',
         'test/test_suite.h',
+        'test/test_utils.cc',
+        'test/test_utils.h',
       ],
     },
     {
       'target_name': 'compositor_unittests',
       'type': 'executable',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/cc/cc.gyp:cc',
         '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
         '<(DEPTH)/ui/gl/gl.gyp:gl',
         '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         'compositor',
         'compositor_test_support',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
         'layer_animation_sequence_unittest.cc',
         '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': [
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
   ],
 }