Fix up compositor mocking.

views/views.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,
   },
 
   'target_defaults': {
@@ skipping 537 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
-        '../ui/gfx/compositor/compositor.gyp:compositor',
         '../ui/gfx/compositor/compositor.gyp:compositor_test_support',
+        '../ui/gfx/compositor/compositor.gyp:test_compositor',
         '../ui/ui.gyp:gfx_resources',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/ui.gyp:ui_resources_standard',
         'views',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
@@ skipping 24 matching lines @@
         'test/test_views_delegate.h',
         'touchui/touch_selection_controller_impl_unittest.cc',
         'view_unittest.cc',
         'widget/native_widget_test_utils.h',
         'widget/native_widget_test_utils_aura.cc',
         'widget/native_widget_test_utils_gtk.cc',
         'widget/native_widget_test_utils_win.cc',
         'widget/native_widget_unittest.cc',
         'widget/native_widget_win_unittest.cc',
         'widget/widget_unittest.cc',
-        '../ui/gfx/compositor/test_compositor.cc',
-        '../ui/gfx/compositor/test_compositor.h',
-        '../ui/gfx/compositor/test_texture.cc',
-        '../ui/gfx/compositor/test_texture.h',
         '../ui/aura/test/test_desktop_delegate.cc',
         '../ui/aura/test/test_desktop_delegate.h',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
@@ skipping 334 matching lines @@
               'dependencies': [
                 '../chrome/chrome.gyp:packed_resources',
                ],
             }],
           ],
         },
       ],
     }],
   ],
 }