Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

content/content_tests.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         '../build/temp_gyp/googleurl.gyp:googleurl',
         'content_browser',
         'content_common',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libvpx/libvpx.gyp:libvpx',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../third_party/webrtc/modules/modules.gyp:video_capture_module',
         '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
         '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
+        '../ui/gfx/compositor/compositor.gyp:test_compositor',
         '../ui/gfx/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui_test_support',
         '../webkit/support/webkit_support.gyp:appcache',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         # TODO(phajdan.jr): All of those files should live in content/test.
         'browser/download/mock_download_file.cc',
@@ skipping 79 matching lines @@
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
         }],
         ['use_glib == 1', {
           'dependencies': [
             '../build/linux/system.gyp:glib',
           ],
         }],
-        ['use_webkit_compositor==1', {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:compositor',
-          ],
-        }, {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
       ],
     },
     {
       'target_name': 'content_unittests',
       'type': 'executable',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_browser',
         'content_gpu',
         'content_plugin',
@@ skipping 272 matching lines @@
           ],
           'sources': [
             'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
           ],
         }
       ],
     },
    ],
   ],
 }