Make cc_unittests and webkit_compositor_unittests executable always

cc/cc_tests.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': 0,
     'use_libcc_for_compositor%': 0,
     'cc_tests_source_files': [
       'CCActiveAnimationTest.cpp',
@@ skipping 45 matching lines @@
       'test/CompositorFakeWebGraphicsContext3D.h',
       'test/FakeCCGraphicsContext.h',
       'test/FakeCCLayerTreeHostClient.h',
       'test/FakeGraphicsContext3DTest.cpp',
       'test/FakeWebCompositorOutputSurface.h',
       'test/FakeWebGraphicsContext3D.h',
       'test/FakeWebScrollbarThemeGeometry.h',
       'test/MockCCQuadCuller.h',
     ],
   },
-  'conditions': [
-    ['use_libcc_for_compositor==1 and component!="shared_library"', {
-      'targets': [
-        {
-          'target_name': 'cc_unittests',
-          'type': 'executable',
+  'targets': [
+    {
+      'target_name': 'cc_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
+        '../testing/gmock.gyp:gmock',
+      ],
+      'sources': [
+        'test/run_all_unittests.cc',
+      ],
+      'conditions': [
+        ['use_libcc_for_compositor==1 and component!="shared_library"', {
           'dependencies': [
-            '../base/base.gyp:test_support_base',
-            '../testing/gtest.gyp:gtest',
-            '../testing/gmock.gyp:gmock',
-            '../webkit/support/webkit_support.gyp:webkit_support',
             '../skia/skia.gyp:skia',
             # We have to depend on WTF directly to pick up the correct defines for WTF headers - for instance USE_SYSTEM_MALLOC.
             '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
             '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
+            '../webkit/support/webkit_support.gyp:webkit_support',
             'cc.gyp:cc',
             'cc_test_support',
           ],
           'defines': [
+            'USE_LIBCC_FOR_COMPOSITOR',
             'WTF_USE_ACCELERATED_COMPOSITING=1',
           ],
           'include_dirs': [
             'stubs',
             'test',
             '.',
           ],
           'sources': [
             '<@(cc_tests_source_files)',
-            'test/run_all_unittests.cc',
           ],
-        },
+        }],
+      ],
+    },
+  ],
+  'conditions': [
+    ['use_libcc_for_compositor==1 and component!="shared_library"', {
+      'targets': [
         {
           'target_name': 'cc_test_support',
           'type': 'static_library',
           'defines': [
             'WTF_USE_ACCELERATED_COMPOSITING=1',
           ],
           'include_dirs': [
             'stubs',
             'test',
             '.',
             '..',
           ],
           'dependencies': [
             '../ui/gl/gl.gyp:gl',
             '../testing/gtest.gyp:gtest',
             '../testing/gmock.gyp:gmock',
             '../skia/skia.gyp:skia',
             '../third_party/WebKit/Source/WTF/WTF.gyp/WTF.gyp:wtf',
             '../third_party/WebKit/Source/Platform/Platform.gyp/Platform.gyp:webkit_platform',
           ],
           'sources': [
             '<@(cc_tests_support_files)',
           ],
         },
       ],
-    }, {
-      'targets': [
-        {
-          'target_name': 'cc_unittests',
-          'type': 'none',
-        }
-      ]
     }],
   ],
 }