Fix up compositor mocking.

ui/aura/aura.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 42 matching lines @@
         'window_observer.h',
         'window_types.h',
       ],
     },
     {
       'target_name': 'test_support_aura',
       'type': 'static_library',
       'dependencies': [
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../ui.gyp:ui',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'test/aura_test_base.cc',
         'test/aura_test_base.h',
         'test/event_generator.cc',
         'test/event_generator.h',
         'test/test_desktop_delegate.cc',
         'test/test_desktop_delegate.h',
-        '../gfx/compositor/test_compositor.cc',
-        '../gfx/compositor/test_compositor.h',
-        '../gfx/compositor/test_texture.cc',
-        '../gfx/compositor/test_texture.h',
       ],
     },
     {
       'target_name': 'aura_demo',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:base_i18n',
         '../../skia/skia.gyp:skia',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../gfx/compositor/compositor.gyp:compositor',
+        '../gfx/compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'demo/demo_main.cc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
       ],
     },
     {
       'target_name': 'aura_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:test_support_base',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
-        '../gfx/compositor/compositor.gyp:compositor',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
+        '../gfx/compositor/compositor.gyp:test_compositor',
         '../gfx/gl/gl.gyp:gl',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         'test_support_aura',
         'aura',
       ],
       'include_dirs': [
         '..',
       ],
@@ skipping 18 matching lines @@
         }],
         ['OS!="mac"', {
           'dependencies': [
             '../../chrome/chrome.gyp:packed_resources',
            ],
         }],
       ],
     },
   ],
 }