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

chrome/chrome_dll.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.
 {
   'conditions': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'shared_library',
           'variables': {
             'enable_wexit_time_destructors': 1,
           },
           'dependencies': [
             '<@(chromium_dependencies)',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
-            ['use_webkit_compositor==1', {
-              'dependencies': [
-                '../ui/gfx/compositor/compositor.gyp:compositor',
-              ],
-            }, { # use_webkit_compositor!=1
-              'dependencies': [
-                '../ui/gfx/compositor/compositor.gyp:test_compositor',
-              ],
-            }],
             ['OS=="win"', {
               'product_name': 'chrome',
               'dependencies': [
                 # On Windows, link the dependencies (libraries) that make
                 # up actual Chromium functionality into this .dll.
                 'chrome_resources.gyp:chrome_resources',
                 'chrome_version_resources',
                 'installer_util_strings',
                 '../content/content.gyp:content_worker',
                 '../crypto/crypto.gyp:crypto',
@@ skipping 468 matching lines @@
                   ],
                 }],
               ],  # conditions
             }],  # OS=="mac"
           ],  # conditions
         },  # target chrome_dll
       ],  # targets
     }],  # OS=="mac" or OS=="win"
   ],
 }