Revert 202787 "Remove unnecessary ui::CompositorTestSupport"

trunk/src/ui/compositor/compositor.gyp

Index: trunk/src/ui/compositor/compositor.gyp
===================================================================
--- trunk/src/ui/compositor/compositor.gyp	(revision 202789)
+++ trunk/src/ui/compositor/compositor.gyp	(working copy)
@@ -79,17 +79,28 @@
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/ui/gl/gl.gyp:gl',
-        '<(DEPTH)/ui/ui.gyp:ui',
-        'compositor',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
+        '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'sources': [
+        'test/compositor_test_support.cc',
+        'test/compositor_test_support.h',
         'test/test_layers.cc',
         'test/test_layers.h',
         'test/test_suite.cc',
         'test/test_suite.h',
       ],
+      'conditions': [
+        ['os_posix == 1 and OS != "mac"', {
+          'conditions': [
+            ['linux_use_tcmalloc==1', {
+              'dependencies': [
+                '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+              ],
+            }],
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'compositor_unittests',
@@ -133,15 +144,6 @@
             '<(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',
-              ],
-            }],
-          ],
-        }],
       ],
     },
   ],