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

build/all.gyp

 # 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': 'All',
       'type': 'none',
       'xcode_create_dependents_test_runner': 1,
@@ skipping 599 matching lines @@
       ],  # targets
     }], # "chromeos==1"
     ['use_aura==1', {
       'targets': [
         {
           'target_name': 'aura_builder',
           'type': 'none',
           'dependencies': [
             '../chrome/chrome.gyp:chrome',
             '../chrome/chrome.gyp:unit_tests',
-            '../chrome/chrome.gyp:ui_tests',
             '../ui/aura_shell/aura_shell.gyp:aura_shell_exe',
             '../ui/aura_shell/aura_shell.gyp:aura_shell_unittests',
             '../ui/aura/aura.gyp:*',
             '../ui/gfx/compositor/compositor.gyp:*',
             '../ui/views/views.gyp:views',
             '../ui/views/views.gyp:views_unittests',
             '../webkit/webkit.gyp:pull_in_webkit_unit_tests',
           ],
           'conditions': [
             ['OS=="win"', {
@@ skipping 19 matching lines @@
                 '../sql/sql.gyp:sql_unittests',
                 '../ui/ui.gyp:gfx_unittests',
               ],
             }],
           ],
         },
       ],  # targets
     }], # "use_aura==1"
   ], # conditions
 }