Merge Compositor and CompositorCC

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     'browser/debugger/devtools_resources.gyp:devtools_resources',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../net/net.gyp:http_server',
@@ skipping 381 matching lines @@
     'browser/power_save_blocker_win.cc',
     'browser/ppapi_plugin_process_host.cc',
     'browser/ppapi_plugin_process_host.h',
     'browser/profiler_controller_impl.cc',
     'browser/profiler_controller_impl.h',
     'browser/profiler_message_filter.cc',
     'browser/profiler_message_filter.h',
     'browser/quota_permission_context.h',
     'browser/renderer_host/accelerated_plugin_view_mac.h',
     'browser/renderer_host/accelerated_plugin_view_mac.mm',
-    'browser/renderer_host/accelerated_surface_container_linux_cc.cc',
+    'browser/renderer_host/accelerated_surface_container_linux.cc',
     'browser/renderer_host/accelerated_surface_container_linux.h',
     'browser/renderer_host/accelerated_surface_container_mac.cc',
     'browser/renderer_host/accelerated_surface_container_mac.h',
     'browser/renderer_host/accelerated_surface_container_manager_mac.cc',
     'browser/renderer_host/accelerated_surface_container_manager_mac.h',
     'browser/renderer_host/async_resource_handler.cc',
     'browser/renderer_host/async_resource_handler.h',
     'browser/renderer_host/backing_store.cc',
     'browser/renderer_host/backing_store.h',
     'browser/renderer_host/backing_store_gtk.cc',
@@ skipping 403 matching lines @@
       'link_settings': {
         'libraries': [
           '-lXcomposite',
         ],
       },
       'include_dirs': [
         '../third_party/angle/include',
       ],
     }, {
       'sources/': [
-        ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_cc.cc'],
+        ['exclude', '^browser/renderer_host/accelerated_surface_container_linux.cc'],
         ['exclude', '^browser/renderer_host/accelerated_surface_container_linux.h'],
         ['exclude', '^browser/renderer_host/image_transport_client.cc'],
         ['exclude', '^browser/renderer_host/image_transport_client.h'],
       ],
     }],
     ['java_bridge==1', {
       'defines': [
         'ENABLE_JAVA_BRIDGE',
       ],
     }, {
       'sources/': [
         ['exclude', '^browser/renderer_host/java/'],
       ],
     }],
   ],
 }