Merge Compositor and CompositorCC

ui/gfx/compositor/compositor.gyp

 # Copyright (c) 2012 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 10 matching lines @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_gpu',
       ],
       'defines': [
         'COMPOSITOR_IMPLEMENTATION',
       ],
       'sources': [
         'compositor.cc',
         'compositor.h',
         'compositor_export.h',
-        'compositor_cc.cc',
-        'compositor_cc.h',
         'compositor_observer.h',
         'compositor_setup.h',
         'compositor_switches.cc',
         'compositor_switches.h',
         'debug_utils.cc',
         'debug_utils.h',
         'layer.cc',
         'layer.h',
         'layer_animation_delegate.h',
         'layer_animation_element.cc',
@@ skipping 86 matching lines @@
         # osmesa GL implementation is used on linux.
         ['OS=="linux"', {
           'dependencies': [
             '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
           ],
         }],
       ],
     },
   ],
 }