Revert 107563 - Fix up compositor mocking.

ui/aura_shell/aura_shell.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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 66 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:test_support_base',
         '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../../views/views.gyp:views',
+        '../gfx/compositor/compositor.gyp:compositor',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
-        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         '../aura/aura.gyp:aura',
         '../aura/aura.gyp:test_support_aura',
         'aura_shell',
       ],
       'sources': [
         'default_container_layout_manager_unittest.cc',
@@ skipping 69 matching lines @@
         '../../views/views.gyp:views_desktop',
         '../../views/views.gyp:views_desktop_lib',
         '../../views/views.gyp:views_unittests',
         '../aura/aura.gyp:*',
         '../gfx/compositor/compositor.gyp:*',
         'aura_shell_exe',
       ],
     },
   ],
 }