Revert 107563 - Fix up compositor mocking.

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2011 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,
   },
   'target_defaults': {
     'sources/': [
@@ skipping 89 matching lines @@
             ],
           }
         ],
       ],
     },
     {
       'target_name': 'compositor_test_support',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/skia/skia.gyp:skia',
       ],
       'sources': [
         'compositor_test_support.cc',
         'compositor_test_support.h',
       ],
       'conditions': [
         ['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',
+          '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': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
         '<(DEPTH)/ui/ui.gyp:gfx_resources',
         '<(DEPTH)/ui/ui.gyp:ui',
         '<(DEPTH)/ui/ui.gyp:ui_resources',
         'compositor',
         'compositor_test_support',
-        'test_compositor',
       ],
       'sources': [
         'layer_animation_element_unittest.cc',
         'layer_animation_sequence_unittest.cc',
         'layer_animator_unittest.cc',
         'layer_unittest.cc',
         'run_all_unittests.cc',
         'test_compositor_host.h',
         'test_compositor_host_linux.cc',
         'test_compositor_host_win.cc',
@@ skipping 15 matching lines @@
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
         ['OS!="mac"', {
           'dependencies': [
             '<(DEPTH)/chrome/chrome.gyp:packed_resources',
            ],
         }],
       ],
     },
-    {
-      'target_name': 'test_compositor',
-      'type': 'static_library',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'sources': [
-        '../test/gfx_test_utils.cc',
-        '../test/gfx_test_utils.h',
-      ],
-      'conditions': [
-        ['views_compositor == 1', {
-          'dependencies': [
-            '<(DEPTH)/skia/skia.gyp:skia',
-            'compositor',
-          ],
-          'sources': [
-            'test_compositor.cc',
-            'test_compositor.h',
-            'test_texture.cc',
-            'test_texture.h',
-          ],              
-        }],
-      ],
-    },
   ],
 }