Revert 113470 - Makes tests either use mock compositor or mock WebGraphicsContext3D depending upo...

chrome/chrome_exe.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': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
@@ skipping 24 matching lines @@
       # be necessary to list app-Info.plist once, not the three times it is
       # listed here.
       'mac_bundle_resources!': [
         'app/app-Info.plist',
       ],
       'xcode_settings': {
         'CHROMIUM_STRIP_SAVE_FILE': 'app/app.saves',
         'INFOPLIST_FILE': 'app/app-Info.plist',
       },
       'conditions': [
-        ['use_aura==1 and use_webkit_compositor==0', {
-          'dependencies': [
-            '../ui/gfx/compositor/compositor.gyp:test_compositor',
-          ],
-        }],
         ['OS == "android"', {
           # Don't put the 'chrome' target in 'all' on android
           'suppress_wildcard': 1,
         }],
         ['os_posix == 1 and OS != "mac"', {
           'actions': [
             {
               'action_name': 'manpage',
               'conditions': [
                 [ 'branding == "Chrome"', {
@@ skipping 491 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }